From 92b68a289008468fffcd63a2994a0f1f6eb8139e Mon Sep 17 00:00:00 2001
From: Brian Jackson <iggy@gentoo.org>
Date: Tue, 2 Dec 2003 03:48:52 +0000
Subject: fix do_brk vuln

---
 sys-kernel/ia64-sources/ChangeLog                  |  6 +++++-
 sys-kernel/ia64-sources/Manifest                   |  5 +++--
 sys-kernel/ia64-sources/files/do_brk_fix.patch     | 12 ++++++++++++
 sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild |  3 ++-
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 sys-kernel/ia64-sources/files/do_brk_fix.patch

(limited to 'sys-kernel/ia64-sources')

diff --git a/sys-kernel/ia64-sources/ChangeLog b/sys-kernel/ia64-sources/ChangeLog
index 796a5f38527e..ac66cd5d2763 100644
--- a/sys-kernel/ia64-sources/ChangeLog
+++ b/sys-kernel/ia64-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ia64-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.3 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.4 2003/12/02 03:48:50 iggy Exp $
+
+  01 Dec 2003; Brian Jackson <iggy@gentoo.org> ia64-sources-2.4.22.ebuild,
+  files/do_brk_fix.patch:
+  fix do_brk vuln
 
   20 Nov 2003; Brandon Low <lostlogic@gentoo.org> ia64-sources-2.4.22.ebuild:
   Move version handling logic to after inherit kernel, or insert it where
diff --git a/sys-kernel/ia64-sources/Manifest b/sys-kernel/ia64-sources/Manifest
index 6a6eb09efbef..37d542201c7e 100644
--- a/sys-kernel/ia64-sources/Manifest
+++ b/sys-kernel/ia64-sources/Manifest
@@ -1,3 +1,4 @@
-MD5 7956ed59d308469b2e902b297e9c1c78 ia64-sources-2.4.22.ebuild 2111
-MD5 7c1770ecd0d2da051e193357cd04c73c ChangeLog 689
+MD5 c0fa9845e7778568f452f756bb47e7a9 ia64-sources-2.4.22.ebuild 2184
+MD5 9b55be0d226dcaa12c249b98b753beee ChangeLog 804
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22 145
diff --git a/sys-kernel/ia64-sources/files/do_brk_fix.patch b/sys-kernel/ia64-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/ia64-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/ia64-sources/ia64-sources-2.4.22.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild
index d882aa50d51d..751b7f7f77a7 100644
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild
+++ b/sys-kernel/ia64-sources/ia64-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/ia64-sources/ia64-sources-2.4.22.ebuild,v 1.4 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild,v 1.5 2003/12/02 03:48:50 iggy Exp $
 
 IUSE=""
 
@@ -48,6 +48,7 @@ src_unpack() {
 #	cat ${DISTDIR}/cset-${MYCSET}.txt.gz | gzip -d | patch -f -p1
 	[ ! -e ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 ] && die "patch not found"
 	cat ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 | bzip2 -d | patch -f -p1
+	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
 	kernel_universal_unpack
 }
 
-- 
cgit v1.2.3-65-gdbad