Added the patch for the mremap/munmap vulnerability. Bug #42024.

4 files changed, 37 insertions, 4 deletions

diff --git a/sys-kernel/aa-sources/ChangeLog b/sys-kernel/aa-sources/ChangeLog
index 073989ad8951..50bca99ff04a 100644
--- a/sys-kernel/aa-sources/ChangeLog
+++ b/sys-kernel/aa-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/aa-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.27 2004/02/16 13:49:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.28 2004/02/18 15:38:38 plasmaroo Exp $
+
+  18 Feb 2004; <plasmaroo@gentoo.org> aa-sources-2.4.23-r1.ebuild,
+  files/aa-sources-2.4.23.munmap.patch:
+  Added the patch for the mremap/munmap vulnerability.
 
   16 Feb 2004; <plasmaroo@gentoo.org> aa-sources-2.4.23-r1.ebuild,
   files/aa-sources-2.4.23.CAN-2004-0001.patch:
diff --git a/sys-kernel/aa-sources/Manifest b/sys-kernel/aa-sources/Manifest
index a1be85497674..850ca357a724 100644
--- a/sys-kernel/aa-sources/Manifest
+++ b/sys-kernel/aa-sources/Manifest
@@ -1,10 +1,11 @@
-MD5 1d3a9e4d9466cffb59c463f0a0027909 ChangeLog 4127
+MD5 e0538fea27eccbf7be9f9199126d0368 ChangeLog 4290
 MD5 399eb7607b8f1f3f597e93566b1bda7c metadata.xml 453
-MD5 cfa2d7ba668fca0e26a687cb664dc6ba aa-sources-2.4.23-r1.ebuild 2344
+MD5 dd95424479551aa582232901c85ddc88 aa-sources-2.4.23-r1.ebuild 2421
 MD5 c3a5fc97c1f5e6d4feb3e0f6b14212d1 aa-sources-2.4.22-r1.ebuild 2418
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/aa-sources-2.4.23.rtc_fix.patch 7073
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/aa-sources-2.4.23.CAN-2003-0985.patch 414
 MD5 bf2b609e8cab6460d220b1267db09826 files/aa-sources-2.4.23.CAN-2004-0001.patch 982
+MD5 174438d215b70cad5ffb00ca8123c062 files/aa-sources-2.4.23.munmap.patch 837
 MD5 017a713155afe3e4b9c5672eef0bc959 files/digest-aa-sources-2.4.22-r1 126
 MD5 fcfb3fc100621b77d191f86b66dd810a files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch 465
 MD5 23188d802797d56fc9b4a55f3b1d3b31 files/digest-aa-sources-2.4.23-r1 126
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild
index 27b8d67002ec..a90a9dba543a 100644
--- a/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.4.23-r1.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/aa-sources/aa-sources-2.4.23-r1.ebuild,v 1.6 2004/02/16 13:49:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild,v 1.7 2004/02/18 15:38:38 plasmaroo Exp $
 
 IUSE="build"
 
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to apply mremap() patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to apply RTC patch!"
+	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/aa-sources/files/aa-sources-2.4.23.munmap.patch b/sys-kernel/aa-sources/files/aa-sources-2.4.23.munmap.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/aa-sources/files/aa-sources-2.4.23.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;
+ 	}