fix do_brk vuln

8 files changed, 34 insertions, 13 deletions

diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 617698613487..b8d189dc1168 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,11 +1,11 @@
-MD5 0b2a0efcf1d8d37b8ecff33dfafccb5e gentoo-sources-2.4.19-r10.ebuild 2362
-MD5 51833e0bc6d99862a8f9976702f3f819 gentoo-sources-2.4.22.ebuild 1914
-MD5 555805733e7c6a53acd48ba99a9802ff gentoo-sources-2.4.20-r6.ebuild 4960
-MD5 52fcaf5c2c81eaec11268a74707934e5 gentoo-sources-2.4.20-r8.ebuild 5562
-MD5 7e97ff22fa23591cc7bfee91cac7e163 gentoo-sources-2.4.20-r5.ebuild 4807
-MD5 83d04ca990d22d86d1e1a7ba2097ca0f ChangeLog 11465
+MD5 f44bfa5126842e2f7868d584c7f9e6ea gentoo-sources-2.4.19-r10.ebuild 2357
+MD5 68ad830b8babd8f53fee04defd92dc0c gentoo-sources-2.4.22.ebuild 1914
+MD5 7288efba37e71ffde0785010a2d2433f gentoo-sources-2.4.20-r6.ebuild 4955
+MD5 32c2163cad1c7253c80be7b369602b92 gentoo-sources-2.4.20-r8.ebuild 5557
+MD5 688100a8740a8219b8cb91cb4b235abb gentoo-sources-2.4.20-r5.ebuild 4802
+MD5 b122032c469005da933e9db77f01e7ea ChangeLog 11733
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 65104522bbd3904aa5bcc23cad487d81 gentoo-sources-2.4.20-r7.ebuild 5382
+MD5 e762158a2758ae895aa519f6d3ccda00 gentoo-sources-2.4.20-r7.ebuild 5377
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 2be721ee04aa311a89ddfe1f3eab2cc0 files/digest-gentoo-sources-2.4.22 149
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
diff --git a/sys-kernel/gentoo-sources/files/do_brk_fix.patch b/sys-kernel/gentoo-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/gentoo-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/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild
index cd38fba77e9b..7fe6a9bdf4d9 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.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/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild,v 1.13 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r10.ebuild,v 1.14 2003/12/01 21:59:51 iggy Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -62,5 +62,7 @@ src_unpack() {
 	# http://www.sourceforge.net/projects/acpi	
 	[ `use acpi4linux` ] || rm 70*
 
+	epatch ${FILESDIR}/do_brk_fix.patch
+
 	kernel_src_unpack
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild
index 520d970ae770..040beb575dc3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.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/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r5.ebuild,v 1.5 2003/12/01 21:59:51 iggy Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -116,6 +116,8 @@ src_unpack() {
 		done
 	fi
 
+	epatch ${FILESDIR}/do_brk_fix.patch
+
 	kernel_src_unpack
 }
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild
index ba0583f4c5d2..5bb2683e05d2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.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/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r6.ebuild,v 1.6 2003/12/01 21:59:51 iggy Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -122,6 +122,7 @@ src_unpack() {
 	epatch ${FILESDIR}/security.patch2
 	epatch ${FILESDIR}/security.patch3
 	epatch ${FILESDIR}/security.patch4
+	epatch ${FILESDIR}/do_brk_fix.patch
 
 }
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
index 7db2af2405d0..6eead41a3171 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.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/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.9 2003/12/01 21:59:51 iggy Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -128,6 +128,7 @@ src_unpack() {
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-ipt-realm.patch
+	epatch ${FILESDIR}/do_brk_fix.patch
 
 }
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild
index 167badde8e03..f39540df3363 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.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/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r8.ebuild,v 1.4 2003/12/01 21:59:51 iggy Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -132,6 +132,7 @@ src_unpack() {
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-mdcount.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-devfs-snd-fix.patch
 	epatch ${FILESDIR}/gentoo-sources-2.4.20-ipt-realm.patch
+	epatch ${FILESDIR}/do_brk_fix.patch
 
 }
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild
index b43ee4ece7e7..05376db641da 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-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/gentoo-sources/gentoo-sources-2.4.22.ebuild,v 1.1 2003/12/01 07:09:29 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22.ebuild,v 1.2 2003/12/01 21:59:51 iggy Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -37,6 +37,8 @@ src_unpack() {
 	bzcat ${DISTDIR}/gentoo-test-sources-${PVR}.patch.bz2 | patch -p1 \
 		|| die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
 
+	epatch ${FILESDIR}/do_brk_fix.patch
+
 	cd ${S}
 	make mrproper || die "make mrproper failed"
 	make include/linux/version.h || die "make include/linux/version.h failed"