fix do_brk vuln

6 files changed, 34 insertions, 9 deletions

diff --git a/sys-kernel/planet-ccrma-sources/ChangeLog b/sys-kernel/planet-ccrma-sources/ChangeLog
index b2dc0b0e42ac..99881144e1ca 100644
--- a/sys-kernel/planet-ccrma-sources/ChangeLog
+++ b/sys-kernel/planet-ccrma-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/planet-ccrma-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/ChangeLog,v 1.5 2003/11/24 04:28:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/ChangeLog,v 1.6 2003/12/02 00:22:30 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  planet-ccrma-sources-2.4.21-r1.ebuild,
+  planet-ccrma-sources-2.4.21-r2.ebuild, planet-ccrma-sources-2.4.21.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
 *planet-ccrma-sources-2.4.21-r2 (23 Nov 2003)
 
diff --git a/sys-kernel/planet-ccrma-sources/Manifest b/sys-kernel/planet-ccrma-sources/Manifest
index 50e6e62c72a0..8f1571c11ffe 100644
--- a/sys-kernel/planet-ccrma-sources/Manifest
+++ b/sys-kernel/planet-ccrma-sources/Manifest
@@ -1,9 +1,10 @@
-MD5 40c9d18749a7e7c3b92e710b0960046c planet-ccrma-sources-2.4.21.ebuild 2875
+MD5 a064084963b5404bfdfa8a814280d1a0 planet-ccrma-sources-2.4.21-r2.ebuild 2922
+MD5 4ed1b9bdb738956a8138f3b61cd65d24 planet-ccrma-sources-2.4.21.ebuild 2951
+MD5 7e06442ed438cd2fd68ca7fa0d6b8caf planet-ccrma-sources-2.4.21-r1.ebuild 3184
+MD5 c34edfd992ad839066863affdde2854d ChangeLog 1180
 MD5 fb311162d56a954e09b111a7d8d0340e metadata.xml 473
-MD5 2060954566e0736662c6a0fa06136bbe ChangeLog 973
-MD5 62e9dceabebcffd28f79547a316f3c8b planet-ccrma-sources-2.4.21-r1.ebuild 3108
-MD5 fa38abe07e2febbdd3151ad55a1a5e3c planet-ccrma-sources-2.4.21-r2.ebuild 2846
 MD5 59f5e2bd9a32c727f02ad6469a0adc68 files/digest-planet-ccrma-sources-2.4.21 164
-MD5 f19e34110f61d3b54f33c176cece8a27 files/kernel.h 473
 MD5 59f5e2bd9a32c727f02ad6469a0adc68 files/digest-planet-ccrma-sources-2.4.21-r1 164
 MD5 59f5e2bd9a32c727f02ad6469a0adc68 files/digest-planet-ccrma-sources-2.4.21-r2 164
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 f19e34110f61d3b54f33c176cece8a27 files/kernel.h 473
diff --git a/sys-kernel/planet-ccrma-sources/files/do_brk_fix.patch b/sys-kernel/planet-ccrma-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/planet-ccrma-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/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r1.ebuild b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r1.ebuild
index 2c55e34d93f4..babe51d32d93 100644
--- a/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-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/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r1.ebuild,v 1.1 2003/10/31 02:16:06 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r1.ebuild,v 1.2 2003/12/02 00:22:30 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -59,6 +59,8 @@ src_unpack() {
 
 	cd ${S}
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r2.ebuild b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r2.ebuild
index 1b03d5513268..fe69fe45eb4a 100644
--- a/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r2.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/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r2.ebuild,v 1.1 2003/11/24 04:28:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r2.ebuild,v 1.2 2003/12/02 00:22:30 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -52,6 +52,8 @@ src_unpack() {
 
 	cd ${S}
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21.ebuild b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21.ebuild
index b793a1f809aa..9f45dd3741a9 100644
--- a/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21.ebuild
+++ b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21.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/planet-ccrma-sources/planet-ccrma-sources-2.4.21.ebuild,v 1.4 2003/10/18 19:58:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21.ebuild,v 1.5 2003/12/02 00:22:30 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -56,6 +56,8 @@ src_unpack() {
 
 	cd ${S}
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }