fix do_brk vuln

6 files changed, 31 insertions, 8 deletions

diff --git a/sys-kernel/ppc-sources/ChangeLog b/sys-kernel/ppc-sources/ChangeLog
index d94d38213d33..6dd9922185b7 100644
--- a/sys-kernel/ppc-sources/ChangeLog
+++ b/sys-kernel/ppc-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ppc-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.28 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.29 2003/12/02 04:01:45 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> ppc-sources-2.4.21-r2.ebuild,
+  ppc-sources-2.4.22-r1.ebuild, ppc-sources-2.4.22-r2.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
 *ppc-sources-2.4.22-r2 (20 Nov 2003)
 
diff --git a/sys-kernel/ppc-sources/Manifest b/sys-kernel/ppc-sources/Manifest
index 8d0078e692f2..2a550f383fad 100644
--- a/sys-kernel/ppc-sources/Manifest
+++ b/sys-kernel/ppc-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 be010b901594e6a159aace3cf908e184 ppc-sources-2.4.22-r1.ebuild 1564
+MD5 d0057d2c066c38f2e2652f4cdfd7c2b8 ppc-sources-2.4.22-r1.ebuild 1638
 MD5 fb30d166ce7dc00bb0c45ef23efc9c26 ppc-sources-2.4.19-r6.ebuild 3269
 MD5 ad26ce4616a2c6d9427716e82e948efd ppc-sources-2.4.20-r2.ebuild 1791
 MD5 de13a1e8ba902690df11b9e82bee0725 ppc-sources-2.4.19.ebuild 3208
@@ -7,13 +7,14 @@ MD5 2409e63ae0fc8522190f13fed924dd03 ppc-sources-2.4.21-r1.ebuild 2237
 MD5 920ebba0f3c529b207ace5287a522fe7 ppc-sources-2.4.20-r4.ebuild 1801
 MD5 c911d93f4cc0093a0de5e4319f42826c ppc-sources-2.4.19-r5.ebuild 3279
 MD5 d4e537d571db846886f68041d2199526 ppc-sources-2.4.20-r1.ebuild 3114
-MD5 c18b2ea325d13a53ce1b46720a3dc7ff ppc-sources-2.4.22-r2.ebuild 1472
+MD5 3269c38855d1b87cebf237bbadc81d63 ppc-sources-2.4.22-r2.ebuild 1546
 MD5 78bfdd74f5201435d7a5698a2ba47148 ppc-sources-2.4.20-r3.ebuild 1792
-MD5 2ced421f92b29c3ec521861ce41dc2e2 ChangeLog 5176
+MD5 dccccca83e41950df1eac7f8104c21ce ChangeLog 5355
 MD5 fe945af4911b04acd2c0f473c7c64f35 metadata.xml 267
 MD5 15f531c3328380f23fcce66016551d75 ppc-sources-2.4.19-r4.ebuild 3436
-MD5 6e5cebaef9aa291ffd264f7142072906 ppc-sources-2.4.21-r2.ebuild 2223
+MD5 362a8cc94128bfb7b5b739b97b39d7bd ppc-sources-2.4.21-r2.ebuild 2296
 MD5 88a216bd55a77f58510b9a1c5c3767ce files/digest-ppc-sources-2.4.19 149
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 6b15a062d96482772f860647c0088358 files/digest-ppc-sources-2.4.19-r3 149
 MD5 9cab1e75f8fcaef7441998de95c9b452 files/digest-ppc-sources-2.4.19-r4 149
 MD5 a6763c046cc20eff0a42ca65f815cb27 files/digest-ppc-sources-2.4.19-r5 149
diff --git a/sys-kernel/ppc-sources/files/do_brk_fix.patch b/sys-kernel/ppc-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/ppc-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/ppc-sources/ppc-sources-2.4.21-r2.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.ebuild
index 3ea671e5891e..d6b4bdcb08fe 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/ppc-sources/ppc-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/ppc-sources/ppc-sources-2.4.21-r2.ebuild,v 1.5 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.21-r2.ebuild,v 1.6 2003/12/02 04:01:45 iggy Exp $
 
 IUSE="build crypt"
 
@@ -54,6 +54,7 @@ src_unpack() {
 		einfo "Cryptographic patches will be applied"
 	fi
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 
 	kernel_src_unpack
 }
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
index eaa41945a879..5fcfcd0aa647 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-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/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.5 2003/12/02 04:01:45 iggy Exp $
 
 IUSE=""
 
@@ -37,6 +37,8 @@ src_unpack() {
 	patch -p1 < ${FILESDIR}/ppc-sources-2.4.22-r1.via-pmu.diff \
 		|| die "patch failed"
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	use xfs && ( ewarn "XFS is no longer included in ppc-sources!" )
 }
 
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild
index 2c2acbd70af0..01e2cde402a9 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.22-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/ppc-sources/ppc-sources-2.4.22-r2.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r2.ebuild,v 1.5 2003/12/02 04:01:45 iggy Exp $
 
 IUSE=""
 
@@ -35,6 +35,8 @@ src_unpack() {
 	cd ${PF}
 	patch -p1 < ${WORKDIR}/patch-${OKV}-${MY_R} || die "patch failed"
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	use xfs && ( ewarn "XFS is no longer included!" )
 }