fix do_brk vuln

9 files changed, 42 insertions, 14 deletions

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index c324f133af5b..bc5a5ded9e91 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.25 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.26 2003/12/02 04:19:13 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> wolk-sources-3.8.ebuild,
+  wolk-sources-4.0.ebuild, wolk-sources-4.10_pre7.ebuild,
+  wolk-sources-4.3.ebuild, wolk-sources-4.9-r1.ebuild,
+  wolk-sources-4.9.ebuild, files/do_brk_fix.patch:
+  fix do_brk vuln
 
   20 Nov 2003; Brandon Low <lostlogic@gentoo.org> wolk-sources-3.8.ebuild,
   wolk-sources-4.0.ebuild, wolk-sources-4.10_pre7.ebuild,
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index 885d78201b7a..3907706eeca3 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,14 +1,15 @@
-MD5 8822b4b296f0d4835fc0ac46092b3738 wolk-sources-3.8.ebuild 984
-MD5 f9a0a7da673dbb625f5a66f65afcc2f1 wolk-sources-4.3.ebuild 1957
-MD5 e989540f27532b35553239df0391cd6b wolk-sources-4.10_pre7.ebuild 3852
-MD5 1d015abd6dd807986b6be983e494dd7c wolk-sources-4.9-r1.ebuild 3945
-MD5 15d98a9043bed7bb8dcdfffa4741b4b4 wolk-sources-4.0.ebuild 1517
-MD5 e2260a85651c7eca876b422a48204a02 ChangeLog 10955
-MD5 4e54e3da6bfe4c3b82011dc801883b0d wolk-sources-4.9.ebuild 1944
+MD5 768d8942a4013e478964f25a51f889d4 wolk-sources-3.8.ebuild 1058
+MD5 8e4f4520b0864a4c7820680e8b9c2be2 wolk-sources-4.3.ebuild 2030
+MD5 f2137563ca3068744036dd43b6b4fda9 wolk-sources-4.10_pre7.ebuild 3927
+MD5 ca259e20a04193fd36cd60c6660eb5ad wolk-sources-4.9-r1.ebuild 4019
+MD5 a81adcbc72b0fda357e9b2a9e8ab3e0f wolk-sources-4.0.ebuild 1590
+MD5 04c846aecb8361664946b2c6c17b25bd ChangeLog 11205
+MD5 b2f49d6fbd9ace86c670b8762d2aa379 wolk-sources-4.9.ebuild 2017
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
 MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
 MD5 89bada44b04d81e4cb483ff373519e20 files/digest-wolk-sources-4.10_pre7 1393
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
 MD5 37d14c054323764430ce967a1de85a02 files/digest-wolk-sources-3.8 151
 MD5 fe2a86c95f4a7a6f47d1b604198e8836 files/digest-wolk-sources-4.0 144
diff --git a/sys-kernel/wolk-sources/files/do_brk_fix.patch b/sys-kernel/wolk-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/wolk-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/wolk-sources/wolk-sources-3.8.ebuild b/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild
index d82620787b24..8c4927c19263 100644
--- a/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-3.8.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/wolk-sources/wolk-sources-3.8.ebuild,v 1.9 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-3.8.ebuild,v 1.10 2003/12/02 04:19:13 iggy Exp $
 
 IUSE="build"
 
@@ -35,4 +35,5 @@ src_unpack() {
 	rm -rf linux-${KV}-patchset
 
 	cd ${WORKDIR}/linux-${KV}
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 }
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild
index 42d49483518b..d2f454f69c39 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.0.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/wolk-sources/wolk-sources-4.0.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.0.ebuild,v 1.7 2003/12/02 04:19:13 iggy Exp $
 
 IUSE="build"
 
@@ -26,6 +26,7 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV} || die
 	cd ${WORKDIR}/linux-${KV}
 	bzcat ${DISTDIR}/linux-${OKV}${EXTRAVERSION}.patch.bz2 | patch -p1 || die
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 	echo "KV=${KV}" >/tmp/KV
 }
 src_install() {
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
index 64c86734ff06..e6b929d230c9 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.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/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.6 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.7 2003/12/02 04:19:13 iggy Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
@@ -67,6 +67,9 @@ local PATCHEFILES="-wolk4.0s -wolk4.0s-to-4.1s -wolk4.1s-to-4.2s -wolk4.2s-to-4.
 			epatch ${DISTDIR}/1007_bootsplash-v3.0.7-2.4.20-1-aty128.patch  || die
 			epatch ${DISTDIR}/1007_bootsplash-v3.0.8-2.4.20-update.patch || die
 		fi
+
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild
index d43ed3c97a82..e516a57db819 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.3.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/wolk-sources/wolk-sources-4.3.ebuild,v 1.10 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.3.ebuild,v 1.11 2003/12/02 04:19:13 iggy Exp $
 
 IUSE="build"
 
@@ -33,6 +33,7 @@ src_unpack() {
 	bzcat ${DISTDIR}/linux-${OKV}-wolk4.0s-to-4.1s.patch.bz2 | patch -p1 || die
 	bzcat ${DISTDIR}/linux-${OKV}-wolk4.1s-to-4.2s.patch.bz2 | patch -p1 || die
 	bzcat ${DISTDIR}/linux-${OKV}-wolk4.2s-to-4.3s.patch.bz2 | patch -p1 || die
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 }
 src_install() {
 	dodir /usr/src
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
index fff9ff23ff71..f1dd92254597 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-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/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.5 2003/12/02 04:19:13 iggy Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
@@ -72,6 +72,8 @@ local PATCHEFILES="-wolk4.0s -wolk4.0s-to-4.1s -wolk4.1s-to-4.2s -wolk4.2s-to-4.
 		epatch ${DISTDIR}/1007_bootsplash-v3.0.8-2.4.20-update.patch || die
 	fi
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
index 300a9123410e..59a7b57ab0e3 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9.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/wolk-sources/wolk-sources-4.9.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9.ebuild,v 1.5 2003/12/02 04:19:13 iggy Exp $
 
 IUSE="build"
 
@@ -43,6 +43,7 @@ src_unpack() {
 	for i in ${WOLK_PATCHLIST}; do
 		bzcat ${DISTDIR}/${i} | patch -p1 || die
 	done
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 }
 src_install() {
 	dodir /usr/src