Security bump; fix #84167.

(Portage version: 2.0.51.19)

9 files changed, 111 insertions, 10 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index e32f7cfd7f2d..04d8955081c2 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.118 2005/03/04 22:26:58 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.119 2005/03/07 00:28:55 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r33 (07 Mar 2005)
+
+  07 Mar 2005; <plasmaroo@gentoo.org> -gentoo-sources-2.4.20-r32.ebuild,
+  +gentoo-sources-2.4.20-r33.ebuild, -gentoo-sources-2.4.25-r16.ebuild,
+  +gentoo-sources-2.4.25-r17.ebuild, -gentoo-sources-2.4.28-r7.ebuild,
+  +gentoo-sources-2.4.28-r8.ebuild,
+  +files/gentoo-sources-2.4.20-PaX-84167.patch,
+  +files/gentoo-sources-2.4.PaX-84167.patch:
+  Security bump; fix #84167.
 
   04 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
   gentoo-sources-2.6.11-r2.ebuild:
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r32 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r33
index 56ce621133b7..56ce621133b7 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r32
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r33
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r16 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r17
index d8241ed0cb08..d8241ed0cb08 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r16
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r17
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r7 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r8
index f231f9c88076..f231f9c88076 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r7
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r8
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-PaX-84167.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-PaX-84167.patch
new file mode 100644
index 000000000000..d150d9a6bc32
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-PaX-84167.patch
@@ -0,0 +1,44 @@
+--- linux-2.4.20-gentoo-r32/mm/mmap.c	2005-03-06 19:33:42.000000000 +0000
++++ linux-2.4.20-gentoo-r33/mm/mmap.c	2005-03-06 19:53:59.501141080 +0000
+@@ -982,7 +982,7 @@
+  * we just free'd - but there's no telling how much before.
+  */
+ static void free_pgtables(struct mm_struct * mm, struct vm_area_struct *prev,
+-	unsigned long start, unsigned long end)
++	struct vm_area_struct *mpnt, unsigned long start, unsigned long end)
+ {
+ 	unsigned long first = start & PGDIR_MASK;
+ 	unsigned long last = end + PGDIR_SIZE - 1;
+@@ -1014,6 +1014,14 @@
+ 		break;
+ 	}
+ no_mmaps:
++	while (mpnt && first < last) {
++		if ((mpnt->vm_end > first) &&(last > mpnt->vm_start)) {
++			first = mpnt->vm_end + PGDIR_SIZE - 1;
++			last = mpnt->vm_start;
++		}
++		mpnt = mpnt->vm_next;
++	}
++
+ 	/*
+ 	 * If the PGD bits are not consecutive in the virtual address, the
+ 	 * old method of shifting the VA >> by PGDIR_SHIFT doesn't work.
+@@ -1072,7 +1080,7 @@
+ 		extra = unmap_vma(mm, addr, len, mpnt, extra);
+ 	}
+ 
+-	free_pgtables(mm, prev, addr, addr+len);
++	free_pgtables(mm, prev, NULL, addr, addr+len);
+ 
+ 	return extra;
+ }
+@@ -1096,7 +1104,7 @@
+ 		find_vma_prev(mm, mpnt->vm_start, &prev);
+ 		extra_m = unmap_vma(mm, addr_m, len, mpnt, extra_m);
+ 
+-		free_pgtables(mm, prev, start, end);
++		free_pgtables(mm, prev, free_m, start, end);
+ 	}               
+ 
+ 	return extra_m;
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.PaX-84167.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.PaX-84167.patch
new file mode 100644
index 000000000000..baf4907aba34
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.PaX-84167.patch
@@ -0,0 +1,44 @@
+--- mm/mmap.c.orig	2005-03-05 13:29:06.000000000 -0500
++++ mm/mmap.c	2005-03-05 13:33:51.000000000 -0500
+@@ -1014,7 +1014,7 @@
+  * we just free'd - but there's no telling how much before.
+  */
+ static void free_pgtables(struct mm_struct * mm, struct vm_area_struct *prev,
+-	unsigned long start, unsigned long end)
++	struct vm_area_struct *mpnt, unsigned long start, unsigned long end)
+ {
+ 	unsigned long first = start & PGDIR_MASK;
+ 	unsigned long last = end + PGDIR_SIZE - 1;
+@@ -1046,6 +1046,14 @@
+ 		break;
+ 	}
+ no_mmaps:
++	while (mpnt && first < last) {
++		if ((mpnt->vm_end > first) &&(last > mpnt->vm_start)) {
++			first = mpnt->vm_end + PGDIR_SIZE - 1;
++			last = mpnt->vm_start;
++		}
++		mpnt = mpnt->vm_next;
++	}
++
+ 	if (last < first)
+ 		return;
+ 	/*
+@@ -1106,7 +1114,7 @@
+ 		extra = unmap_vma(mm, addr, len, mpnt, extra);
+ 	}
+ 
+-	free_pgtables(mm, prev, addr, addr+len);
++	free_pgtables(mm, prev, NULL, addr, addr+len);
+ 
+ 	return extra;
+ }
+@@ -1130,7 +1138,7 @@
+ 		find_vma_prev(mm, mpnt->vm_start, &prev);
+ 		extra_m = unmap_vma(mm, addr_m, len, mpnt, extra_m);
+ 
+-		free_pgtables(mm, prev, start, end);
++		free_pgtables(mm, prev, free_m, start, end);
+ 	}               
+ 
+ 	return extra_m;
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r32.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r33.ebuild
index a0ae1de35111..b6597e758a9a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r32.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # 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-r32.ebuild,v 1.1 2005/02/17 18:12:52 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r33.ebuild,v 1.1 2005/03/07 00:28:55 plasmaroo Exp $
 
 IUSE="aavm crypt evms2 usagi"
 
@@ -30,7 +30,7 @@ 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/32/28}.tar.bz2
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/33/28}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.2.patch"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
@@ -42,7 +42,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/r32/r28}
+	cd ${WORKDIR}/${KV/r33/r28}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if ! use aavm; then
@@ -162,6 +162,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.78362.patch || die "Failed to apply #78362 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.78363.patch || die "Failed to apply #78363 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.81106.patch || die "Failed to apply #81106 patch!"
+	epatch ${FILESDIR}/${P}-PaX-84167.patch || die "Failed to apply #84167 patch!"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r17.ebuild
index e79705141ccb..5975ed023f45 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r16.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r16.ebuild,v 1.1 2005/02/17 18:12:52 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r17.ebuild,v 1.1 2005/03/07 00:28:55 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -41,7 +41,8 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.77666.patch
 	${FILESDIR}/${PN}-2.4.78362.patch
 	${FILESDIR}/${PN}-2.4.78363.patch
-	${FILESDIR}/${PN}-2.4.81106.patch"
+	${FILESDIR}/${PN}-2.4.81106.patch
+	${FILESDIR}/${PN}-2.4.PaX-84167.patch"
 
 DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~livewire/${P}.patch.bz2
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r8.ebuild
index a3a05128a6cb..601febd92b7c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r7.ebuild,v 1.2 2005/02/19 21:21:43 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r8.ebuild,v 1.1 2005/03/07 00:28:55 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -10,7 +10,7 @@ KEYWORDS="x86 -ppc"
 IUSE=''
 
 UNIPATCH_STRICTORDER='Y'
-UNIPATCH_LIST="${DISTDIR}/${PF/r7/r4}.tar.bz2
+UNIPATCH_LIST="${DISTDIR}/${PF/r8/r4}.tar.bz2
 	${DISTDIR}/ck-sources-${PV}-CAN-2004-0814.patch
 	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
 	${FILESDIR}/${PN}-2.4.vma.patch
@@ -25,8 +25,9 @@ UNIPATCH_LIST="${DISTDIR}/${PF/r7/r4}.tar.bz2
 	${FILESDIR}/${PN}-2.4.78363.patch
 	${FILESDIR}/${PN}-2.4.81106.patch
 	${FILESDIR}/${P}.arpFix.patch
-	${FILESDIR}/${P}.77181.patch"
+	${FILESDIR}/${P}.77181.patch
+	${FILESDIR}/${PN}-2.4.PaX-84167.patch"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r7/r4}.tar.bz2
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r8/r4}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/ck-sources-${PV}-CAN-2004-0814.patch"