14 files changed, 83 insertions, 21 deletions
diff --git a/sys-kernel/ppc-sources-crypto/ChangeLog b/sys-kernel/ppc-sources-crypto/ChangeLog
index a589a460d7b3..a708d96630b1 100644
--- a/sys-kernel/ppc-sources-crypto/ChangeLog
+++ b/sys-kernel/ppc-sources-crypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ppc-sources-crypto
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-crypto/ChangeLog,v 1.3 2003/03/10 17:43:32 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-crypto/ChangeLog,v 1.4 2003/12/02 04:10:31 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org>
+  ppc-sources-crypto-2.4.20.ebuild, files/do_brk_fix.patch:
+  fix do_brk vuln
 
   10 Mar 2003; Olivier Reisch <doctomoe@gentoo.org> ppc-sources-crypto-2.4.20.ebuild:
   Marked ppc stable
diff --git a/sys-kernel/ppc-sources-crypto/Manifest b/sys-kernel/ppc-sources-crypto/Manifest
index c6ee021fb23c..5690b19101b0 100644
--- a/sys-kernel/ppc-sources-crypto/Manifest
+++ b/sys-kernel/ppc-sources-crypto/Manifest
@@ -1,4 +1,5 @@
-MD5 236df182b5e3f5532a7ea052995cac82 ChangeLog 584
+MD5 733191c17e9184205fb18d6008fc22ba ppc-sources-crypto-2.4.20.ebuild 3304
+MD5 4134929c2c4f76588c3c19a8dbfbbbc9 ChangeLog 706
 MD5 043b3ab3fa1052b12838dfa30667cb19 metadata.xml 353
-MD5 6f4d1ebe56646c14dee682c2c84732f7 ppc-sources-crypto-2.4.20.ebuild 3229
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 02d35ae561da62158d02dd7264e7e5db files/digest-ppc-sources-crypto-2.4.20 78
diff --git a/sys-kernel/ppc-sources-crypto/files/do_brk_fix.patch b/sys-kernel/ppc-sources-crypto/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/ppc-sources-crypto/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/ppc-sources-crypto/ppc-sources-crypto-2.4.20.ebuild b/sys-kernel/ppc-sources-crypto/ppc-sources-crypto-2.4.20.ebuild
index 0ec0ca8d8723..37b1146d901e 100644
--- a/sys-kernel/ppc-sources-crypto/ppc-sources-crypto-2.4.20.ebuild
+++ b/sys-kernel/ppc-sources-crypto/ppc-sources-crypto-2.4.20.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/ppc-sources-crypto/ppc-sources-crypto-2.4.20.ebuild,v 1.8 2003/09/10 04:32:25 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources-crypto/ppc-sources-crypto-2.4.20.ebuild,v 1.9 2003/12/02 04:10:31 iggy Exp $
 
 IUSE="build crypt"
 
@@ -46,6 +46,8 @@ src_unpack() {
 	cd ${S}
 	pwd
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	#sometimes we have icky kernel symbols; this seems to get rid of them
 	make mrproper || die
 
diff --git a/sys-kernel/rsbac-sources/ChangeLog b/sys-kernel/rsbac-sources/ChangeLog
index 7551c6e90310..f4ba410a09a5 100644
--- a/sys-kernel/rsbac-sources/ChangeLog
+++ b/sys-kernel/rsbac-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/rsbac-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.2 2003/02/12 09:18:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/ChangeLog,v 1.3 2003/12/02 04:11:38 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> rsbac-sources-2.4.20.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
 *rsbac-sources-2.4.20 (7 Feb 2003)
 
diff --git a/sys-kernel/rsbac-sources/Manifest b/sys-kernel/rsbac-sources/Manifest
index 22f75d8f2f0b..2280849f7ef1 100644
--- a/sys-kernel/rsbac-sources/Manifest
+++ b/sys-kernel/rsbac-sources/Manifest
@@ -1,4 +1,5 @@
-MD5 8be41a400c85308907cdc3a2bca16558 ChangeLog 370
-MD5 f6508f74cb813ae3dc696d29f7ecf0d1 rsbac-sources-2.4.20.ebuild 3097
+MD5 d3af31420ef5d60389143c9043b6d4f1 rsbac-sources-2.4.20.ebuild 3177
+MD5 7801aeb4a15b36c8f30a64f8986b21d9 ChangeLog 489
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 79053afe39299a3f4c205204dd0b5e49 files/digest-rsbac-sources-2.4.20 403
 MD5 e7532d3b86be69c91d6530663358559c files/nr_rsbac_patch.diff 295
diff --git a/sys-kernel/rsbac-sources/files/do_brk_fix.patch b/sys-kernel/rsbac-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/rsbac-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/rsbac-sources/rsbac-sources-2.4.20.ebuild b/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild
index 8d175cb19917..101450472328 100644
--- a/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild
+++ b/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.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/rsbac-sources/rsbac-sources-2.4.20.ebuild,v 1.6 2003/10/27 13:49:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-sources/rsbac-sources-2.4.20.ebuild,v 1.7 2003/12/02 04:11:38 iggy Exp $
 
 ETYPE="sources"
 
@@ -60,6 +60,8 @@ src_unpack() {
 		patch -p1 < ${BUGFIX}-3.diff || die "cannot apply fix patch 1"
 		echo "-> Fix patch 3 applied"
 
+		epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 		# We need to have our kernel in /boot
 		mv Makefile Makefile.orig
 		sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index fbb46af41f95..49c0c3167a63 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.34 2003/12/01 17:23:07 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.35 2003/12/02 04:13:45 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> sparc-sources-2.4.20-r8.ebuild,
+  sparc-sources-2.4.21-r1.ebuild, sparc-sources-2.4.22.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
 *sparc-sources-2.4.23 (01 Dec 2003)
 
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index 22cb07781031..3f06f1ed3196 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,14 +1,15 @@
-MD5 86eff1cdf3bb6c9c4c0e6229d5fc693d ChangeLog 6150
-MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
-MD5 a79bf1f2e01309da7f069b79696061bf sparc-sources-2.4.20-r8.ebuild 2321
-MD5 d8daaf8b1916aff1059e181071455c87 sparc-sources-2.4.21-r1.ebuild 2155
-MD5 2c5c5fe6fdd340af6c64aeb0c59f6804 sparc-sources-2.4.22.ebuild 2152
+MD5 084b1528fa23bc2836219c1b5d0644a6 sparc-sources-2.4.21-r1.ebuild 2229
 MD5 34a347e2b0eaa4ac76faa335675407f9 sparc-sources-2.4.23.ebuild 2150
+MD5 29de7eebe8a32ba875514a32f6f95d07 sparc-sources-2.4.20-r8.ebuild 2395
+MD5 754c42fba6640866b8dbbac53d24fe8d sparc-sources-2.4.22.ebuild 2226
+MD5 62b22986f0752351d55739fdc35d0560 ChangeLog 6336
+MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
+MD5 afd982621a7d4faba455607353e659c9 files/digest-sparc-sources-2.4.22 140
+MD5 8c8598fb61743bb94c3a9eaf3ff339f4 files/digest-sparc-sources-2.4.23 140
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
 MD5 5cc2d0aaf480b0f39d42e04133d4138a files/digest-sparc-sources-2.4.20-r8 143
 MD5 78fb563990b579b7408f77a65ca176a0 files/digest-sparc-sources-2.4.21-r1 143
-MD5 afd982621a7d4faba455607353e659c9 files/digest-sparc-sources-2.4.22 140
-MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
-MD5 8c8598fb61743bb94c3a9eaf3ff339f4 files/digest-sparc-sources-2.4.23 140
-MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
 MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
+MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
diff --git a/sys-kernel/sparc-sources/files/do_brk_fix.patch b/sys-kernel/sparc-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/sparc-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/sparc-sources/sparc-sources-2.4.20-r8.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
index 73e61bd96927..bd45547364f6 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild
+++ b/sys-kernel/sparc-sources/sparc-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/sparc-sources/sparc-sources-2.4.20-r8.ebuild,v 1.8 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.20-r8.ebuild,v 1.9 2003/12/02 04:13:45 iggy Exp $
 
 IUSE="build ultra1"
 
@@ -45,6 +45,8 @@ src_unpack() {
 
 	cd ${WORKDIR}/${KV}
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_src_unpack
 
 	# Patch the HME driver only on Ultra1 machines.
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
index 19542ffb99a3..c2376a98ce41 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/sparc-sources/sparc-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/sparc-sources/sparc-sources-2.4.21-r1.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.21-r1.ebuild,v 1.7 2003/12/02 04:13:45 iggy Exp $
 
 IUSE="build ultra1"
 
@@ -40,6 +40,8 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 	cd ${WORKDIR}/${KV}
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_src_unpack
 
 	# Patch the HME driver only on Ultra1 machines.
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild
index a6dd3bcde3e0..0b12208ce425 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild
+++ b/sys-kernel/sparc-sources/sparc-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/sparc-sources/sparc-sources-2.4.22.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.22.ebuild,v 1.5 2003/12/02 04:13:45 iggy Exp $
 
 IUSE="build ultra1"
 
@@ -40,6 +40,8 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 	cd ${WORKDIR}/${KV}
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_src_unpack
 
 	# Patch the HME driver only on Ultra1 machines.