fix do_brk vuln

5 files changed, 34 insertions, 15 deletions

diff --git a/sys-kernel/hppa-sources/ChangeLog b/sys-kernel/hppa-sources/ChangeLog
index c2a3ba323768..6a7e9f43d1dc 100644
--- a/sys-kernel/hppa-sources/ChangeLog
+++ b/sys-kernel/hppa-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/hppa-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.19 2003/11/19 05:00:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/ChangeLog,v 1.20 2003/12/02 03:37:30 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> hppa-sources-2.4.22_p13.ebuild,
+  hppa-sources-2.4.22_p17.ebuild, files/do_brk_fix.patch:
+  fix do_brk vuln
 
 *hppa-sources-2.4.22_p17 (19 Nov 2003)
 
diff --git a/sys-kernel/hppa-sources/Manifest b/sys-kernel/hppa-sources/Manifest
index ec342080068f..f5cd4dcbad8d 100644
--- a/sys-kernel/hppa-sources/Manifest
+++ b/sys-kernel/hppa-sources/Manifest
@@ -1,23 +1,24 @@
-MD5 23fbfad7017570de095b26abd001fc3c ChangeLog 3092
-MD5 622e8f2314c5ea410458584582a6e460 hppa-sources-2.4.21_p10.ebuild 1561
+MD5 a7731136711ea8a34621c9247dece54a hppa-sources-2.4.22_p6.ebuild 1795
 MD5 0758f55b4873a3d88c96aec4952597c3 hppa-sources-2.4.21_p13.ebuild 1879
-MD5 38b00b5d2411620e0ff2f40b7f3228f6 hppa-sources-2.4.21_p2.ebuild 1082
-MD5 dc1a2fc752979121cc9bad084290ea83 hppa-sources-2.4.21_p6.ebuild 1082
-MD5 1f0f4c545f91d73945cd2b70cef8048a hppa-sources-2.4.21_p7.ebuild 1082
-MD5 8ead225e4121c070404ba3246354ac60 hppa-sources-2.4.21_p8.ebuild 1485
 MD5 a6ee3f76c9292211bafbc08ab583b3ce hppa-sources-2.4.21_p9.ebuild 1560
+MD5 0dcef44b9c80df51b0a94704894f781e hppa-sources-2.4.22_p13.ebuild 1874
+MD5 622e8f2314c5ea410458584582a6e460 hppa-sources-2.4.21_p10.ebuild 1561
+MD5 dc1a2fc752979121cc9bad084290ea83 hppa-sources-2.4.21_p6.ebuild 1082
 MD5 09f6accca0f7d64509ba9c0ceb968229 hppa-sources-2.4.22_p10.ebuild 1787
-MD5 a7731136711ea8a34621c9247dece54a hppa-sources-2.4.22_p6.ebuild 1795
-MD5 73163d13e15653d51ad7bff9a63b3bd2 hppa-sources-2.4.22_p13.ebuild 1798
-MD5 1bc846ec80d7326ccec79817836d8242 hppa-sources-2.4.22_p17.ebuild 1798
-MD5 7743c939ccccf0343faed987e12b489b files/digest-hppa-sources-2.4.21_p10 334
-MD5 306724fa77532e2a73c383f7322f1e56 files/digest-hppa-sources-2.4.21_p13 469
+MD5 8ead225e4121c070404ba3246354ac60 hppa-sources-2.4.21_p8.ebuild 1485
+MD5 6bdfbb6a1254cd02158e028a37e5266f hppa-sources-2.4.22_p17.ebuild 1874
+MD5 bf3ecd428cdd211a49b5b57210ec25f8 ChangeLog 3246
+MD5 1f0f4c545f91d73945cd2b70cef8048a hppa-sources-2.4.21_p7.ebuild 1082
+MD5 38b00b5d2411620e0ff2f40b7f3228f6 hppa-sources-2.4.21_p2.ebuild 1082
 MD5 605092c92ae7fda21bdfc646556c3318 files/digest-hppa-sources-2.4.21_p2 136
 MD5 b2a01f9d9202ffe4b10185dcc41f55ec files/digest-hppa-sources-2.4.21_p6 136
 MD5 9713ddfd2816df19fe5a221d409997d6 files/digest-hppa-sources-2.4.21_p7 136
 MD5 c16dd23afd0850e41877ee85a61a1a55 files/digest-hppa-sources-2.4.21_p8 202
 MD5 93220ee92a635bcde32a9c516ae5601c files/digest-hppa-sources-2.4.21_p9 267
-MD5 2bd1bdfb78a5c8ecf8fc7284051f9a50 files/digest-hppa-sources-2.4.22_p10 395
 MD5 f7f4dbcc460742f63598a1986ff400c1 files/digest-hppa-sources-2.4.22_p6 262
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 7743c939ccccf0343faed987e12b489b files/digest-hppa-sources-2.4.21_p10 334
+MD5 306724fa77532e2a73c383f7322f1e56 files/digest-hppa-sources-2.4.21_p13 469
+MD5 2bd1bdfb78a5c8ecf8fc7284051f9a50 files/digest-hppa-sources-2.4.22_p10 395
 MD5 362841daf5331eb63eb1227293fa32ad files/digest-hppa-sources-2.4.22_p13 598
 MD5 21f8036e5fe4337145680f7b384774ab files/digest-hppa-sources-2.4.22_p17 870
diff --git a/sys-kernel/hppa-sources/files/do_brk_fix.patch b/sys-kernel/hppa-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/hppa-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/hppa-sources/hppa-sources-2.4.22_p13.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild
index cadc670a60a8..de0199af2cae 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.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/hppa-sources/hppa-sources-2.4.22_p13.ebuild,v 1.1 2003/10/29 16:35:31 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.22_p13.ebuild,v 1.2 2003/12/02 03:37:30 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -45,6 +45,7 @@ src_unpack() {
 		zcat ${DISTDIR}/patch-${OKV}-pa${a}-pa${b}.gz | patch -sp 1
 	done
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild
index cd29e21a0fcb..8ec3045fc5a4 100644
--- a/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild
+++ b/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.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/hppa-sources/hppa-sources-2.4.22_p17.ebuild,v 1.1 2003/11/19 05:00:33 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hppa-sources/hppa-sources-2.4.22_p17.ebuild,v 1.2 2003/12/02 03:37:30 iggy Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -45,6 +45,7 @@ src_unpack() {
 		zcat ${DISTDIR}/patch-${OKV}-pa${a}-pa${b}.gz | patch -sp 1
 	done
 
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 
 	kernel_universal_unpack
 }