add patch for the new munmap vuln

5 files changed, 81 insertions, 2 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index ab82a220bd0a..1d2d28df1866 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.40 2004/02/12 12:53:22 livewire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.41 2004/02/18 17:43:13 iggy Exp $
+
+*xfs-sources-2.4.24-r2 (18 Feb 2004)
+
+  18 Feb 2004; Brian Jackson <iggy@gentoo.org> xfs-sources-2.4.24-r2.ebuild:
+  add patch for the new munmap vuln
 
 *xfs-sources-2.4.24-r1 (12 Feb 2004)
 
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 09ecbbfcc929..2ec255c8c278 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -5,16 +5,18 @@ MD5 7502294f51542ace5d89419433107497 xfs-sources-2.4.20-r3.ebuild 2297
 MD5 6131bc0df38cdb946967ceea9c8ffd0e xfs-sources-2.4.23-r1.ebuild 1257
 MD5 d99799a0531b6a4f1d0c2671de2a3bd8 xfs-sources-2.4.20-r5.ebuild 2517
 MD5 c4f209d9bc759c47d15b5b056131cd35 xfs-sources-2.4.24.ebuild 1065
+MD5 7a1c98a028bb42e5e4cf1f24f4a41e46 xfs-sources-2.4.24-r2.ebuild 1137
 MD5 4980429952168194a39b7656d909137a xfs-sources-2.4.20-r2.ebuild 2202
 MD5 362ccecfa0cb07471317a27e762e7250 xfs-sources-2.4.19-r3.ebuild 2339
 MD5 f02e213426423fa9c483eb893ab9e0e0 xfs-sources-2.4.20-r4.ebuild 2322
-MD5 da234dcb881bb37a0b314883a7d37a9f ChangeLog 10375
+MD5 ce0deb515fe21121f8c19f2d8b64f0c5 ChangeLog 10523
 MD5 9d0457271fd1f3afdcf4f7ee602d3b34 metadata.xml 414
 MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
 MD5 d53055aeb748e8680c3232c405c5ec89 files/digest-xfs-sources-2.4.24 141
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/xfs-sources-2.4.20.rtc_fix.patch 6769
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/xfs-sources-2.4.22.rtc_fix.patch 7073
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 174438d215b70cad5ffb00ca8123c062 files/xfs-sources-2.4.24.munmap.patch 837
 MD5 3afd3962750ab6706f9a9878a94cfd8d files/xfs-sources-2.4.20-gcc33.patch 10849
 MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/xfs-sources.CAN-2003-0985.patch 414
@@ -27,3 +29,4 @@ MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r4 142
 MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r5 142
 MD5 f296f6804e8a1b632ff0939c10c66ea5 files/digest-xfs-sources-2.4.23-r1 141
 MD5 24da024c498c1c154d80a7264e3a6fe9 files/digest-xfs-sources-2.4.24-r1 144
+MD5 24da024c498c1c154d80a7264e3a6fe9 files/digest-xfs-sources-2.4.24-r2 144
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r2 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r2
new file mode 100644
index 000000000000..a5896036351f
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r2
@@ -0,0 +1,2 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 382291043af6e6f545dfd4cb9319de6d xfs-sources-2.4.24-r1.patch.bz2 1378159
diff --git a/sys-kernel/xfs-sources/files/xfs-sources-2.4.24.munmap.patch b/sys-kernel/xfs-sources/files/xfs-sources-2.4.24.munmap.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources-2.4.24.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/xfs-sources/xfs-sources-2.4.24-r2.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.24-r2.ebuild
new file mode 100644
index 000000000000..9e6626229cac
--- /dev/null
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.24-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 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.24-r2.ebuild,v 1.1 2004/02/18 17:43:13 iggy Exp $
+
+ETYPE="sources"
+
+inherit kernel
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}-${PR}"
+KV=${OKV}${EXTRAVERSION}
+
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://dev.gentoo.org/~scox/kernels/v2.4/xfs-sources-${PV}-r1.patch.bz2"
+
+KEYWORDS="x86 -ppc -sparc "
+SLOT="${KV}"
+
+src_unpack() {
+
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+
+	cd linux-${KV}
+
+	bzcat ${DISTDIR}/xfs-sources-${PV}-r1.patch.bz2 | patch -p1 \
+		|| die "Failed to patch kernel"
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}.munmap.patch || die "munmap patch failed"
+
+	make mrproper || die "make mrproper failed"
+	kernel_universal_unpack
+
+}
+