[arch-commits] Commit in dosfstools/trunk (2 files)

[Tobias Powalowski]

    Date: Monday, June 10, 2013 @ 11:29:38
  Author: tpowa
Revision: 188131

upgpkg: dosfstools 3.0.18-2

fix buffer overflow #35734

Added:
  dosfstools/trunk/3.0.18-use-memcpy-instead-of-strcpy.patch
Modified:
  dosfstools/trunk/PKGBUILD

-------------------------------------------+
 3.0.18-use-memcpy-instead-of-strcpy.patch |   15 +++++++++++++++
 PKGBUILD                                  |   14 ++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

Added: 3.0.18-use-memcpy-instead-of-strcpy.patch
===================================================================
--- 3.0.18-use-memcpy-instead-of-strcpy.patch	                        (rev 0)
+++ 3.0.18-use-memcpy-instead-of-strcpy.patch	2013-06-10 09:29:38 UTC (rev 188131)
@@ -0,0 +1,15 @@
+--- src/mkfs.fat.c.old	2013-06-09 12:30:43.626408604 -0400
++++ src/mkfs.fat.c	2013-06-09 12:30:28.306756934 -0400
+@@ -743,10 +743,10 @@
+ 	 * differently: The jump code is only 2 bytes (and m68k machine code
+ 	 * :-), then 6 bytes filler (ignored), then 3 byte serial number. */
+ 	bs.boot_jump[2] = 'm';
+-	strcpy((char *)bs.system_id, "kdosf");
++	memcpy((char *)bs.system_id, "kdosf", strlen("kdosf"));
+     }
+     else
+-	strcpy((char *)bs.system_id, "mkfs.fat");
++	memcpy((char *)bs.system_id, "mkfs.fat", strlen("mkfs.fat"));
+     if (sectors_per_cluster)
+ 	bs.cluster_size = (char)sectors_per_cluster;
+     if (size_fat == 32) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-10 08:37:53 UTC (rev 188130)
+++ PKGBUILD	2013-06-10 09:29:38 UTC (rev 188131)
@@ -3,16 +3,19 @@
 # Committer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=dosfstools
 pkgver=3.0.18
-pkgrel=1
+pkgrel=2
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc')
-source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
+source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
+        3.0.18-use-memcpy-instead-of-strcpy.patch)
 url="http://www.daniel-baumann.ch/software/dosfstools/"
 license=('GPL2')
-md5sums=('a80aab6aac9e56e937b0392a85bfadb9'
-         'SKIP')
 
+prepare() {
+   cd $srcdir/$pkgname-$pkgver
+   patch -Np0 -i ../3.0.18-use-memcpy-instead-of-strcpy.patch
+}
 build() {
    cd $srcdir/$pkgname-$pkgver
    make
@@ -22,3 +25,6 @@
    cd $srcdir/$pkgname-$pkgver
    make DESTDIR=$pkgdir PREFIX=/usr SBINDIR=/usr/bin MANDIR=/usr/share/man DOCDIR=/usr/share/doc install
 }
+md5sums=('a80aab6aac9e56e937b0392a85bfadb9'
+         'SKIP'
+         '771cf771aadce6ab0b1c9944bf535011')