fix do_brk vuln

5 files changed, 27 insertions, 6 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 07d65ae16e25..3a143807b48c 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.7 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.8 2003/12/02 00:36:23 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  win4lin-sources-2.4.20-r1.ebuild, win4lin-sources-2.4.22.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
   20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
   win4lin-sources-2.4.20-r1.ebuild, win4lin-sources-2.4.22.ebuild:
diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest
index e100a3d17c51..618bedfc797d 100644
--- a/sys-kernel/win4lin-sources/Manifest
+++ b/sys-kernel/win4lin-sources/Manifest
@@ -1,6 +1,6 @@
-MD5 2e621ac8f22e69dccb234766927a4322 win4lin-sources-2.4.22.ebuild 1173
-MD5 4518a3a023a173c2d1fdb0441c53031e ChangeLog 1303
-MD5 c797a4a328e0937077319f44a015b53d win4lin-sources-2.4.20-r1.ebuild 1369
+MD5 0deeef013192d80cc8456e31e09c419c win4lin-sources-2.4.22.ebuild 1168
+MD5 8417f54411e1e1852c5468de5c45b037 ChangeLog 1457
+MD5 2dd30f7c7931a79d0d46ec0e2590fc14 win4lin-sources-2.4.20-r1.ebuild 1364
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 a3ac6282b407aaef5e22644f04ce59ee files/digest-win4lin-sources-2.4.22 201
 MD5 ec72e31e51b6973ced56cfac1c6f0878 files/digest-win4lin-sources-2.4.20-r1 201
diff --git a/sys-kernel/win4lin-sources/files/do_brk_fix.patch b/sys-kernel/win4lin-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/do_brk_fix.patch
@@ -0,0 +1,12 @@
+--- a/mm/mmap.c Fri Sep 12 06:44:06 2003
++++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
+@@ -1041,6 +1041,9 @@
+	if (!len)
+		return addr;
+ 
++ 	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
++ 		return -EINVAL;
++ 
+	/*
+	 * mlock MCL_FUTURE?
+	 */
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
index 2f07571df3de..4fccfec74073 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild,v 1.7 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild,v 1.8 2003/12/02 00:36:23 iggy Exp $
 
 IUSE="build"
 
@@ -37,5 +37,7 @@ src_unpack() {
 	cat ${DISTDIR}/mki-adapter.patch|patch -p1 || die "-mki-adapter patch failed"
 	cat ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch|patch -p1 || die "-Win4Lin3 patch failed"
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild
index dddfe5bed383..42b3f2bce595 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild,v 1.3 2003/12/01 19:12:27 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild,v 1.4 2003/12/02 00:36:23 iggy Exp $
 
 IUSE="build"
 
@@ -34,6 +34,8 @@ src_unpack() {
 	cd linux-${KV}
 	cat ${DISTDIR}/mki-adapter.patch | patch -p1 &> /dev/null || die "Error: mki-adapter patch failed!"
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 
 }