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

7 files changed, 106 insertions, 59 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index 5d37b6e54346..bf4b45eb25f6 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/vserver-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.2 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.3 2004/04/15 12:58:28 plasmaroo Exp $
+
+*vserver-sources-2.4.25.1.3.8-r1 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org> vserver-sources-2.4.25.1.3.8-r1.ebuild:
+  Version bump for the CAN-2004-0109 issue; bug #47881. Old versions removed.
 
 *vserver-sources-2.4.25.1.3.8 (25 Mar 2004)
 *vserver-sources-2.4.24.1.26 (25 Mar 2004)
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index 2396f05eeae0..791a69e2f913 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -1,5 +1,4 @@
-MD5 e9a1bd3eb2f1dd253ba5bcb4230b6251 vserver-sources-2.4.25.1.3.8.ebuild 1462
-MD5 d91a2b828f202d9e8e8dad375123da3a vserver-sources-2.4.24.1.26.ebuild 1424
-MD5 1556c4e214352981156a8829678573de ChangeLog 533
-MD5 9c485dd51f9cf7c01f570363b79011be files/digest-vserver-sources-2.4.25.1.3.8 138
-MD5 4e21ec66cf69b62a0e91b0bf9ccc9928 files/digest-vserver-sources-2.4.24.1.26 139
+MD5 bba08b336e6a7cb02048ff7bd825acb7 ChangeLog 743
+MD5 17cec9b648e5cb92570261b2def0e8a1 vserver-sources-2.4.25.1.3.8-r1.ebuild 1458
+MD5 21f3a4f186017d925067335e24db36a1 files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch 1877
+MD5 9c485dd51f9cf7c01f570363b79011be files/digest-vserver-sources-2.4.25.1.3.8-r1 138
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.24.1.26 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.24.1.26
deleted file mode 100644
index 350d62cfd023..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.24.1.26
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 dd86e4cc32a6caa44d60e1608ece133e patch-2.4.24-vs1.26.diff.bz2 29613
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r1
index 051653be757b..051653be757b 100644
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8
+++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r1
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.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/vserver-sources/vserver-sources-2.4.24.1.26.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.24.1.26.ebuild
deleted file mode 100644
index a934bf12f7bf..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.4.24.1.26.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.24.1.26.ebuild,v 1.1 2004/03/25 13:41:30 tantive Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel
-OKV=2.4.24
-KV=2.4.24
-
-## idea: after the kernel-version (2.4.23) we append the vs-version (e.g. 1.22) to
-## get 2.4.23.1.22 that is globbed out here:
-EXTRAVERSION="-vs${PV#*.*.*.}"
-
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.23 kernel sources (or newer)
-# vs-1.20 (or newer)
-
-DESCRIPTION="Linux kernel with ctx-/vserver-patch"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://www.13thfloor.at/vserver/s_release/${EXTRAVERSION/-vs/v}/patch-${KV}${EXTRAVERSION}.diff.bz2"
-HOMEPAGE="http://www.kernel.org/ http://www.13thfloor.at/vserver/ http://www.linux-vserver.org/"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV}${EXTRAVERSION} || die "mv to -extraversion failed"
-
-	cd linux-${KV}${EXTRAVERSION} || die "cd to kernel-src failed"
-	epatch ${DISTDIR}/patch-${KV}${EXTRAVERSION}.diff.bz2
-	#zcat ${DISTDIR}/patch-${KV}${EXTRAVERSION}.gz |\
-	#	patch -p1 || die "patching kernel with vserver failed"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r1.ebuild
index 053ce0a400c4..79fec8dcc248 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r1.ebuild
@@ -1,7 +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/vserver-sources/vserver-sources-2.4.25.1.3.8.ebuild,v 1.1 2004/03/25 13:41:30 tantive Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r1.ebuild,v 1.1 2004/04/15 12:58:28 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -10,10 +9,10 @@ KV=2.4.25
 
 ## idea: after the kernel-version (2.4.25) we append the vs-version (e.g. 1.3.8) to
 ## get 2.4.25.1.3.8 that is globbed out here:
-EXTRAVERSION="-vs${PV#*.*.*.}"
+EXTRAVERSION="-vs${PV#*.*.*.}-${PR}"
+VEXTRAVERSION="-vs${PV#*.*.*.}"
 
 S=${WORKDIR}/linux-${KV}
-
 # What's in this kernel?
 
 # INCLUDED:
@@ -22,7 +21,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Linux kernel with DEVEL version ctx-/vserver-patch"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://www.13thfloor.at/vserver/d_release/${EXTRAVERSION/-vs/v}/linux-vserver-${EXTRAVERSION/-vs/}.tar.bz2"
+	http://www.13thfloor.at/vserver/d_release/${EXTRAVERSION/-vs/v}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2"
 HOMEPAGE="http://www.kernel.org/ http://www.13thfloor.at/vserver/ http://www.linux-vserver.org/"
 
 KEYWORDS="~x86"
@@ -31,12 +30,13 @@ SLOT="${KV}"
 src_unpack() {
 	unpack linux-${OKV}.tar.bz2
 	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV}${EXTRAVERSION} || die "mv to -extraversion failed"
+	mv linux-${OKV} linux-${KV}${EXTRAVERSION}
 
-	tar xvjf ${DISTDIR}/linux-vserver-${EXTRAVERSION/-vs/}.tar.bz2 || die "unpacking patch failed"
+	tar xvjf ${DISTDIR}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2 || die "Unpacking patch failed!"
 
-	cd linux-${KV}${EXTRAVERSION} || die "cd to kernel-src failed"
-	epatch ${WORKDIR}/patch-${KV}${EXTRAVERSION}.diff
+	cd linux-${KV}${EXTRAVERSION}
+	epatch ${WORKDIR}/patch-${KV}${VEXTRAVERSION}.diff
+	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 
 	kernel_universal_unpack
 }