Version bump for the CAN-2004-0109 issue; bug #47881.

10 files changed, 149 insertions, 15 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index d810ca32ef34..0aa3a37da629 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,15 @@
 # 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.64 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.65 2004/04/15 21:34:08 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r14 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org>
+  +files/gentoo-sources-2.4.CAN-2004-0109.patch,
+  -gentoo-sources-2.4.19-r11.ebuild, +gentoo-sources-2.4.19-r12.ebuild,
+  -gentoo-sources-2.4.20-r14.ebuild, +gentoo-sources-2.4.20-r15.ebuild,
+  +gentoo-sources-2.4.22-r8.ebuild, +gentoo-sources-2.4.25-r1.ebuild:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
 
 *gentoo-sources-2.4.26_pre6 (26 Mar 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r11 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r12
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r11
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r12
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r15
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r14
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r15
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8
new file mode 100644
index 000000000000..a564b8210a40
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r8
@@ -0,0 +1,2 @@
+MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
+MD5 7f4a97d9c29f7dfc959a7a7efb077e29 gentoo-sources-2.4.22-r5.patch.bz2 3766950
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1
new file mode 100644
index 000000000000..b1beb984fb40
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r1
@@ -0,0 +1,2 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
+MD5 221b18b5bcc2ede8a1d3616fda8e7ace gentoo-sources-2.4.25.patch.bz2 1617350
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0109.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0109.patch
@@ -0,0 +1,87 @@
+--- linux/fs/isofs/rock.c.orig
++++ linux/fs/isofs/rock.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
++#include <asm/page.h>
+ 
+ #include "rock.h"
+ 
+@@ -419,7 +420,7 @@
+   return 0;
+ }
+ 
+-static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
++static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
+ {
+ 	int slen;
+ 	int rootflag;
+@@ -431,16 +432,25 @@
+ 		rootflag = 0;
+ 		switch (slp->flags & ~1) {
+ 		case 0:
++			if (slp->len > plimit - rpnt)
++				return NULL;
+ 			memcpy(rpnt, slp->text, slp->len);
+ 			rpnt+=slp->len;
+ 			break;
++		case 2:
++			if (rpnt >= plimit)
++				return NULL;
++			*rpnt++='.';
++			break;
+ 		case 4:
++			if (2 > plimit - rpnt)
++				return NULL;
+ 			*rpnt++='.';
+-			/* fallthru */
+-		case 2:
+ 			*rpnt++='.';
+ 			break;
+ 		case 8:
++			if (rpnt >= plimit)
++				return NULL;
+ 			rootflag = 1;
+ 			*rpnt++='/';
+ 			break;
+@@ -457,17 +467,23 @@
+ 			 * If there is another SL record, and this component
+ 			 * record isn't continued, then add a slash.
+ 			 */
+-			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
++			if ((!rootflag) && (rr->u.SL.flags & 1) &&
++			    !(oldslp->flags & 1)) {
++				if (rpnt >= plimit)
++					return NULL;
+ 				*rpnt++='/';
++			}
+ 			break;
+ 		}
+ 
+ 		/*
+ 		 * If this component record isn't continued, then append a '/'.
+ 		 */
+-		if (!rootflag && !(oldslp->flags & 1))
++		if (!rootflag && !(oldslp->flags & 1)) {
++			if (rpnt >= plimit)
++				return NULL;
+ 			*rpnt++='/';
+-
++		}
+ 	}
+ return rpnt;
+ }
+@@ -548,7 +564,10 @@
+ 			CHECK_SP(goto out);
+ 			break;
+ 		case SIG('S', 'L'):
+-			rpnt = get_symlink_chunk(rpnt, rr);
++			rpnt = get_symlink_chunk(rpnt, rr,
++						 link + (PAGE_SIZE - 1));
++			if (rpnt == NULL)
++				goto out;
+ 			break;
+ 		case SIG('C', 'E'):
+ 			/* This tells is if there is a continuation record */
+
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r12.ebuild
index 11f65803bd45..b6b4c7914990 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r11.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-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.19-r11.ebuild,v 1.2 2004/02/24 20:37:26 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r12.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/11/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/12/10}.tar.bz2"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/11/10}
+	cd ${KV/12/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -59,10 +59,11 @@ src_unpack() {
 
 	kernel_src_unpack
 
-	cd linux-${KV}
+	cd ${S}
 	patch -p1 < ${FILESDIR}/lcall-DoS.patch || die "lcall-DoS patch failed"
 	patch -p1 < ${FILESDIR}/i810_drm.patch || die "i810_drm patch failed"
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to apply do_brk() patch!"
 	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
-	cd ..
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to patch CAN-2003-0985 vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.ebuild
index e7e1c9f131a3..cc51c2cfde0b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r14.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.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-r14.ebuild,v 1.1 2004/03/07 23:27:58 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r15.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm 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}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/15/14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips "
@@ -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/15/14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -125,18 +125,16 @@ src_unpack() {
 	epatch ${FILESDIR}/security.patch4
 
 	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}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to apply mremap() fix!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0001.patch || die "Failed to apply AMD64 ptrace patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 	epatch ${FILESDIR}/${P}-rtc_fix.patch || die "Failed to apply RTC fix!"
 	epatch ${FILESDIR}/${P}-munmap.patch || die "Failed to apply munmap patch!"
-
 }
 
 pkg_postinst() {
-
 	kernel_pkg_postinst
 
-	echo
 	ewarn "There is no xfs support in this kernel."
 	ewarn "If you need xfs support, emerge xfs-sources."
 	echo
@@ -156,5 +154,4 @@ pkg_postinst() {
 	echo
 	einfo "Please read the ChangeLog and associated docs for more information."
 	echo
-
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild
new file mode 100644
index 000000000000..edc01bc60454
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r8.ebuild
@@ -0,0 +1,23 @@
+# 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-r8.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
+
+UNIPATCH_LIST="${FILESDIR}/gentoo-sources-2.4.CAN-2004-0001.patch ${DISTDIR}/gentoo-sources-${PVR/8/5}.patch.bz2 ${FILESDIR}/gentoo-sources-2.4.munmap.patch ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch"
+ETYPE="sources"
+
+inherit kernel-2
+detect_version
+
+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/8/5}.patch.bz2"
+KEYWORDS="x86 -*"
+SLOT="${KV}"
+
+K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
+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."
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild
new file mode 100644
index 000000000000..09ccba449822
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r1.ebuild
@@ -0,0 +1,13 @@
+# 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.25-r1.ebuild,v 1.1 2004/04/15 21:34:08 plasmaroo Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+KEYWORDS="x86"
+UNIPATCH_LIST="${DISTDIR}/${P}.patch.bz2 ${FILESDIR}/${PN}-2.4.CAN-2004-0109.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"