updated mremap patch

9 files changed, 28 insertions, 16 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 41956e7e09a0..8688234125e4 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/mips-sources
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.21 2004/01/06 01:53:15 kumba Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.22 2004/01/19 08:29:43 kumba Exp $
+
+*mips-sources-2.4.23-r3 (19 Jan 2004)
+
+  19 Jan 2004; Joshua Kinard <kumba@gentoo.org> mips-sources-2.4.21-r3.ebuild,
+  mips-sources-2.4.21-r4.ebuild, mips-sources-2.4.22-r6.ebuild,
+  mips-sources-2.4.22-r7.ebuild, mips-sources-2.4.23-r2.ebuild,
+  mips-sources-2.4.23-r3.ebuild, files/mremap-fix-try2.patch,
+  files/mremap-fix.patch:
+  updated the mremap patch
 
 *mips-sources-2.4.21-r3 (05 Jan 2004)
 
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index a050128a4289..81c60c535f71 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,10 +1,11 @@
-MD5 8a042cd33cbce88036f7033d3f9c0c25 ChangeLog 6038
+MD5 dc59e8f98090595734069306cd456364 ChangeLog 6400
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 fab7c51b60717c7154ba8aa18f746b60 mips-sources-2.4.21-r3.ebuild 1552
-MD5 70e3f22cbb1cc2b57a5262391cd02cc7 mips-sources-2.4.23-r2.ebuild 2205
-MD5 4f0eb829ea0cb4511d6eb4b72c3fe0f4 mips-sources-2.4.22-r6.ebuild 1788
-MD5 05f3097edb6fd323d0ddf083fb25f838 files/mremap-fix.patch 414
+MD5 6153203419df8c620aa6df7cde9a0db1 mips-sources-2.4.22-r7.ebuild 1793
+MD5 5697e04f4193bd05841df8375a8f77da mips-sources-2.4.23-r3.ebuild 2210
+MD5 d9064ff690269ae37a40623756efcdd0 mips-sources-2.4.21-r4.ebuild 1557
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r3 145
+MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r6 144
 MD5 ea1908cecc8ab0d5ef958b4abc8b1da1 files/digest-mips-sources-2.4.23-r2 352
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
@@ -13,5 +14,7 @@ MD5 5b060a7bbac28c36788a02e99721db97 files/mipscvs-2.4.22-makefile-mips64-tweak.
 MD5 e40e67b089d55da6d5aeb91ae63a81cb files/mipscvs-2.4.22-sgiwd-fix.patch 1256
 MD5 6ff178aa1398ac2347921194944376f8 files/mipscvs-2.4.23-makefile-fix.patch 1906
 MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
-MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r6 144
-MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r3 145
+MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/mremap-fix-try2.patch 414
+MD5 76b0e72e1a0025451c3fcf8d00faaf0a files/digest-mips-sources-2.4.21-r4 145
+MD5 c111f35ab5bf4506b4974d7336eea3dc files/digest-mips-sources-2.4.22-r7 144
+MD5 ea1908cecc8ab0d5ef958b4abc8b1da1 files/digest-mips-sources-2.4.23-r3 352
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r4
index 9e16838f5d98..9e16838f5d98 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r3
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r4
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r6 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r7
index 5276a20886f0..5276a20886f0 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r6
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r7
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r3
index f24578de6653..f24578de6653 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r3
diff --git a/sys-kernel/mips-sources/files/mremap-fix.patch b/sys-kernel/mips-sources/files/mremap-fix-try2.patch
index eb1c9d26b3d5..03f49e4f6d7d 100644
--- a/sys-kernel/mips-sources/files/mremap-fix.patch
+++ b/sys-kernel/mips-sources/files/mremap-fix-try2.patch
@@ -5,7 +5,7 @@
  	new_len = PAGE_ALIGN(new_len);
  
 +	/* Don't allow the degenerate cases */
-+	if (!(old_len | new_len))
++	if (!old_len || !new_len)
 +		goto out;
 +
  	/* new_addr is only valid if MREMAP_FIXED is specified */
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r4.ebuild
index e64ec234af0e..abed9a251918 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r4.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/mips-sources/mips-sources-2.4.21-r3.ebuild,v 1.1 2004/01/06 01:53:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r4.ebuild,v 1.1 2004/01/19 08:29:44 kumba Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -43,7 +43,7 @@ src_unpack() {
 	epatch ${FILESDIR}/do_brk_fix.patch
 
 	# mremap fix (Possibly Exploitable)
-	epatch ${FILESDIR}/mremap-fix.patch
+	epatch ${FILESDIR}/mremap-fix-try2.patch
 
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.patch
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r6.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r7.ebuild
index 055be1542bdf..61beb383623d 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r6.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-r7.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/mips-sources/mips-sources-2.4.22-r6.ebuild,v 1.1 2004/01/06 01:53:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r7.ebuild,v 1.1 2004/01/19 08:29:44 kumba Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -48,7 +48,7 @@ src_unpack() {
 	epatch ${FILESDIR}/do_brk_fix.patch
 
 	# mremap fix (Possibly Exploitable)
-	epatch ${FILESDIR}/mremap-fix.patch
+	epatch ${FILESDIR}/mremap-fix-try2.patch
 
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.patch
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r2.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r3.ebuild
index a8aa59f6870e..8fdb2dfaf0c7 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r2.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-r3.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/mips-sources/mips-sources-2.4.23-r2.ebuild,v 1.1 2004/01/06 01:53:15 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r3.ebuild,v 1.1 2004/01/19 08:29:44 kumba Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -45,7 +45,7 @@ src_unpack() {
 	epatch ${FILESDIR}/mipscvs-${OKV}-makefile-fix.patch
 
 	# mremap fix (Possibly Exploitable)
-	epatch ${FILESDIR}/mremap-fix.patch
+	epatch ${FILESDIR}/mremap-fix-try2.patch
 
 	# MIPS RTC Fixes (Fixes memleaks, backport from 2.4.24)
 	epatch ${FILESDIR}/rtc-fixes.patch