fix do_brk vuln

9 files changed, 48 insertions, 18 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 15254c46182f..7a6dff5c171e 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.28 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.29 2003/12/01 22:59:57 tseng Exp $
+
+  01 Dec 2003; Brandon Hale <tseng@gentoo.org> xfs-sources-2.4.19-r2.ebuild,
+  xfs-sources-2.4.20-r1.ebuild, xfs-sources-2.4.20-r2.ebuild,
+  xfs-sources-2.4.20-r3.ebuild, xfs-sources-2.4.20.ebuild,
+  xfs-sources-2.4.22.ebuild, files/do_brk_fix.patch:
+  fix do_brk vuln
 
   20 Nov 2003; Brandon Low <lostlogic@gentoo.org>
   xfs-sources-2.4.19-r2.ebuild:
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index b16ef675585d..5133b928fd22 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,10 +1,10 @@
-MD5 fdfe20d18bbc748a8dd187170677e01e ChangeLog 8218
-MD5 c0b315e3193b2401efe26e59f9134f88 xfs-sources-2.4.19-r2.ebuild 2122
-MD5 987e73396354a05667985910eca0efb1 xfs-sources-2.4.20-r1.ebuild 2197
-MD5 445d18ed6afbf4b2c17d35663069dc72 xfs-sources-2.4.20-r2.ebuild 2199
-MD5 610b87f6c61f31d09fcacfb06cc6f8c6 xfs-sources-2.4.20-r3.ebuild 2250
-MD5 7f47265c407e6296dbef7021d90c2c95 xfs-sources-2.4.20.ebuild 2209
-MD5 9a4df4bd79eb4241f8d188c30133bfca xfs-sources-2.4.22.ebuild 2209
+MD5 9b0decc9e7ef7dc6ccd8a5f9d7450cc8 ChangeLog 8214
+MD5 334aa7829b79935b41ce44ff31c9dc3a xfs-sources-2.4.19-r2.ebuild 2119
+MD5 55be1a54633e8b2475cb2398e052c720 xfs-sources-2.4.20-r1.ebuild 2195
+MD5 7800dd1cf7f03f13006cd6927e643bee xfs-sources-2.4.20-r2.ebuild 2197
+MD5 eae87a9c038dae40ce89ec900cfb5499 xfs-sources-2.4.20-r3.ebuild 2246
+MD5 1431602dd359cebe91c11d201a7ef905 xfs-sources-2.4.20.ebuild 2207
+MD5 bf3ca553c90116c918d14405ef426358 xfs-sources-2.4.22.ebuild 2206
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r2 142
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
diff --git a/sys-kernel/xfs-sources/files/do_brk_fix.patch b/sys-kernel/xfs-sources/files/do_brk_fix.patch
new file mode 100644
index 000000000000..fef1f1e981e2
--- /dev/null
+++ b/sys-kernel/xfs-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/xfs-sources/xfs-sources-2.4.19-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
index 6de3b60d2071..84da67fb8b72 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.19-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/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.9 2003/11/20 07:43:38 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.19-r2.ebuild,v 1.10 2003/12/01 22:59:57 tseng Exp $
 
 IUSE="build crypt"
 
@@ -52,6 +52,8 @@ src_unpack() {
 	# This is the latest release of ACPI from 
 	# http://www.sourceforge.net/projects/acpi	
 	[ `use acpi4linux` ] || rm 70*
-
+	
+	#IMPORTANT! Root Exploit!
+    epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
index 3e93057b6c8f..a608cdd75a54 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-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/xfs-sources/xfs-sources-2.4.20-r1.ebuild,v 1.5 2003/09/07 18:53:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r1.ebuild,v 1.6 2003/12/01 22:59:57 tseng Exp $
 
 IUSE="build crypt"
 
@@ -62,6 +62,8 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-
+	
+	#IMPORTANT! Root Exploit!
+	epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
index c2853530de77..89e65a69ec90 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-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/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.5 2003/09/07 18:53:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r2.ebuild,v 1.6 2003/12/01 22:59:57 tseng Exp $
 
 IUSE="build crypt"
 
@@ -62,6 +62,8 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-
+	
+	#IMPORTANT! Root Exploit!
+    epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
index d6e7bf618c85..5fadff76c4ae 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.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/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.6 2003/10/11 19:58:02 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20-r3.ebuild,v 1.7 2003/12/01 22:59:57 tseng Exp $
 
 IUSE="build crypt"
 
@@ -63,6 +63,8 @@ src_unpack() {
 		einfo "Cryptographic support enabled..."
 	fi
 
+	#IMPORTANT! Root Exploit!
+	epatch ${FILESDIR}/do_brk_fix.patch	
 	kernel_src_unpack
 	epatch ${FILESDIR}/xfs-sources-2.4.20-gcc33.patch
 
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
index a4d2226a0abd..e0c342951072 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild
+++ b/sys-kernel/xfs-sources/xfs-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/xfs-sources/xfs-sources-2.4.20.ebuild,v 1.4 2003/09/07 18:53:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.20.ebuild,v 1.5 2003/12/01 22:59:57 tseng Exp $
 
 IUSE="build crypt"
 
@@ -63,5 +63,7 @@ src_unpack() {
 		einfo "Cryptographic support enabled..."
 	fi
 
+	#IMPORTANT! Root Exploit!
+    epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }
diff --git a/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
index 8b20c1babe77..7755fcead786 100644
--- a/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild
+++ b/sys-kernel/xfs-sources/xfs-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/xfs-sources/xfs-sources-2.4.22.ebuild,v 1.1 2003/10/27 01:14:24 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.22.ebuild,v 1.2 2003/12/01 22:59:57 tseng Exp $
 
 IUSE="build crypt"
 
@@ -62,6 +62,8 @@ src_unpack() {
 	else
 		einfo "Cryptographic support enabled..."
 	fi
-
+	
+	#IMPORTANT! Root Exploit!
+	epatch ${FILESDIR}/do_brk_fix.patch
 	kernel_src_unpack
 }