Fixed gentoo-sources-2.4.20-r11 flags, removed gentoo-sources-2.4.22-r6, and added the patch for the mremap/munmap vulnerability. Bug #42024.

8 files changed, 73 insertions, 15 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 56a17da098d7..987be9d23a58 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.58 2004/02/16 16:11:59 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.59 2004/02/18 17:15:13 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r13 (18 Feb 2004)
+
+  18 Feb 2004; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r13.ebuild,
+  gentoo-sources-2.4.22-r7.ebuild:
+  Added the patch for the mremap/munmap vulnerability. Bug #42024.
 
 *gentoo-sources-2.4.22-r6 (16 Feb 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r11 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r13
index 41b830eea9bc..41b830eea9bc 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r11
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r13
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r6 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r7
index a564b8210a40..a564b8210a40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r6
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r7
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-munmap.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-munmap.patch
new file mode 100644
index 000000000000..e5fb62eb95e1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-munmap.patch
@@ -0,0 +1,27 @@
+--- linux-2.4.20-wolk4.9s/mm/mremap.c	2004-02-18 15:46:31.000000000 +0000
++++ linux-2.4.20-wolk4.9s/mm/mremap.c.plasmaroo	2004-02-18 15:51:29.000000000 +0000
+@@ -316,7 +316,9 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+@@ -324,9 +326,11 @@
+ 	 * the unnecessary pages..
+ 	 * do_munmap does all the needed commit accounting
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 		old_len = new_len;
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.munmap.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.munmap.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.munmap.patch
@@ -0,0 +1,27 @@
+diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
+--- linux-2.4.25-rc3/mm/mremap.c	2004-02-18 13:56:01.000000000 +0000
++++ linux-2.4.25-rc4/mm/mremap.c	2004-02-18 13:49:08.000000000 +0000
+@@ -258,16 +258,20 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+ 	 * Always allow a shrinking remap: that just unmaps
+ 	 * the unnecessary pages..
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 	}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
index 8dd57fea1cc9..e69a0afe3fe3 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild,v 1.2 2004/02/18 08:17:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r12.ebuild,v 1.3 2004/02/18 17:15:14 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -33,7 +33,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/12/11}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="-* -amd64 -ia64"
+KEYWORDS="-* ~amd64"
 SLOT="${KV}"
 
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r13.ebuild
index 0e57b9ee597c..f6e18f00815c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r11.ebuild,v 1.3 2004/02/18 08:17:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r13.ebuild,v 1.1 2004/02/18 17:15:14 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,10 +30,10 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/13/11}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha -hppa -mips -arm -amd64 -ia64"
+KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips -arm"
 SLOT="${KV}"
 
 
@@ -41,7 +41,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV}
+	cd ${WORKDIR}/${KV/13/11}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -127,7 +127,8 @@ src_unpack() {
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() fix!"
 	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
 	epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
-	epatch ${FILESDIR}/gentoo-sources-2.4.20-rtc_fix.patch || die "Failed to apply RTC fix!"
+	epatch ${FILESDIR}/${P}-rtc_fix.patch || die "Failed to apply RTC fix!"
+	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
 
 }
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r7.ebuild
index 022cacf3a729..aeff9b3a2fc2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r6.ebuild,v 1.2 2004/02/18 08:17:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r7.ebuild,v 1.1 2004/02/18 17:15:14 plasmaroo Exp $
 
-#UNIPATCH_LIST="${DISTDIR}/gentoo-sources-${PVR}.patch.bz2"
+UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR/7/5}.patch.bz2 ${FILESDIR}/gentoo-sources-2.4.munmap.patch"
 ETYPE="sources"
 
 inherit kernel-2
@@ -14,8 +14,8 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR}.patch.bz2"
-KEYWORDS="~x86 -*"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/7/5}.patch.bz2"
+KEYWORDS="x86 -*"
 SLOT="${KV}"
 
 K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
@@ -23,6 +23,3 @@ existing bug. Only create a new bug if you have not found one that matches
 your issue. It is best to do an advanced search as the initial search has a
 very low yield. Please assign your bugs to x86-kernel@gentoo.org.
 Please read the ChangeLog and associated docs for more information."
-
-K_EXTRAEWARN="I've dropped htree and orlov patches from this one, so plan 
-accordingly."