fix do_brk vuln

5 files changed, 28 insertions, 6 deletions

diff --git a/sys-kernel/gentoo-test-sources/ChangeLog b/sys-kernel/gentoo-test-sources/ChangeLog
index e90f216dd12f..7d654997f2fd 100644
--- a/sys-kernel/gentoo-test-sources/ChangeLog
+++ b/sys-kernel/gentoo-test-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/gentoo-test-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/ChangeLog,v 1.4 2003/11/23 15:50:38 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/ChangeLog,v 1.5 2003/12/01 22:10:34 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  gentoo-test-sources-2.4.22-r1.ebuild, gentoo-test-sources-2.4.22.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
   23 Nov 2003; Brian Jackson <iggy@gentoo.org>
   gentoo-test-sources-2.4.22-r1.ebuild, gentoo-test-sources-2.4.22.ebuild:
diff --git a/sys-kernel/gentoo-test-sources/Manifest b/sys-kernel/gentoo-test-sources/Manifest
index 55e11c6d4f94..00b6cb92c400 100644
--- a/sys-kernel/gentoo-test-sources/Manifest
+++ b/sys-kernel/gentoo-test-sources/Manifest
@@ -1,6 +1,7 @@
-MD5 ce67230948d573b61c43b8d5c508ec36 gentoo-test-sources-2.4.22-r1.ebuild 1879
-MD5 8e224a5bc4477387d12d29e02b538ce2 gentoo-test-sources-2.4.22.ebuild 2248
-MD5 4f031c86c16f59028436ec6fc8e33dbf ChangeLog 1189
+MD5 b1b8afc415c17f1df672329513832c7e gentoo-test-sources-2.4.22-r1.ebuild 1917
+MD5 08943da300ff8e1d81b12f26d913f640 gentoo-test-sources-2.4.22.ebuild 2286
+MD5 04f0973952530aa973f748433e457dbf ChangeLog 1356
 MD5 1b80ca9e6de4c327e48871e1c446e54a metadata.xml 402
 MD5 2be721ee04aa311a89ddfe1f3eab2cc0 files/digest-gentoo-test-sources-2.4.22 149
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 7d9ee7da8217d527e59789279837d94a files/digest-gentoo-test-sources-2.4.22-r1 152
diff --git a/sys-kernel/gentoo-test-sources/files/do_brk_fix.patch b/sys-kernel/gentoo-test-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/gentoo-test-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-test-sources/gentoo-test-sources-2.4.22-r1.ebuild b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild
index 624b581d3e4b..dfd402576fef 100644
--- a/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-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/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild,v 1.4 2003/11/23 15:50:38 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22-r1.ebuild,v 1.5 2003/12/01 22:10:34 iggy Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -35,6 +35,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"
diff --git a/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild b/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild
index 6b667ade7afa..c8d0b2b998c5 100644
--- a/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild
+++ b/sys-kernel/gentoo-test-sources/gentoo-test-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-test-sources/gentoo-test-sources-2.4.22.ebuild,v 1.4 2003/11/23 15:50:38 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-test-sources/gentoo-test-sources-2.4.22.ebuild,v 1.5 2003/12/01 22:10:34 iggy Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -44,6 +44,8 @@ src_unpack() {
 
 	bzcat ${DISTDIR}/gentoo-test-sources-${PV}.patch.bz2 | patch -p1 || die "Failed to patch kernel, please file a bug at bugs.gentoo.org"
 
+	epatch ${FILESDIR}/do_brk_fix.patch
+
 	kernel_src_unpack
 }