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

5 files changed, 165 insertions, 27 deletions

diff --git a/sys-kernel/xfs-sources/ChangeLog b/sys-kernel/xfs-sources/ChangeLog
index 940f9126d3d6..6b7d5016c775 100644
--- a/sys-kernel/xfs-sources/ChangeLog
+++ b/sys-kernel/xfs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/xfs-sources
 # Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.43 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/ChangeLog,v 1.44 2004/04/15 18:16:06 plasmaroo Exp $
+
+*xfs-sources-2.4.24-r4 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org> +files/xfs-sources.CAN-2004-0109.patch,
+  +xfs-sources-2.4.24-r4.ebuild:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> xfs-sources-2.4.24-r3.ebuild:
   Add eutils to inherit, add IUSE=
diff --git a/sys-kernel/xfs-sources/Manifest b/sys-kernel/xfs-sources/Manifest
index 70eb0c871fb3..912bfeaa8ea8 100644
--- a/sys-kernel/xfs-sources/Manifest
+++ b/sys-kernel/xfs-sources/Manifest
@@ -1,34 +1,37 @@
-MD5 bc1840b22fbca3216cc2d10679c534d7 xfs-sources-2.4.24-r1.ebuild 1073
-MD5 ccb24e8a4128475f97bf020f5b0a952a xfs-sources-2.4.20-r1.ebuild 2193
-MD5 2540889800dda7b38f0c4f61899a5747 xfs-sources-2.4.20.ebuild 2203
+MD5 4ce9a306a27ecc603c5df768aa84f8a8 ChangeLog 10995
+MD5 f02e213426423fa9c483eb893ab9e0e0 xfs-sources-2.4.20-r4.ebuild 2322
+MD5 c4f209d9bc759c47d15b5b056131cd35 xfs-sources-2.4.24.ebuild 1065
 MD5 f0a9e84650d3661de4d2f6078920a808 xfs-sources-2.4.24-r3.ebuild 1152
-MD5 7502294f51542ace5d89419433107497 xfs-sources-2.4.20-r3.ebuild 2297
-MD5 6131bc0df38cdb946967ceea9c8ffd0e xfs-sources-2.4.23-r1.ebuild 1257
+MD5 9d0457271fd1f3afdcf4f7ee602d3b34 metadata.xml 414
+MD5 2540889800dda7b38f0c4f61899a5747 xfs-sources-2.4.20.ebuild 2203
 MD5 d99799a0531b6a4f1d0c2671de2a3bd8 xfs-sources-2.4.20-r5.ebuild 2517
-MD5 c4f209d9bc759c47d15b5b056131cd35 xfs-sources-2.4.24.ebuild 1065
-MD5 7a1c98a028bb42e5e4cf1f24f4a41e46 xfs-sources-2.4.24-r2.ebuild 1137
-MD5 4980429952168194a39b7656d909137a xfs-sources-2.4.20-r2.ebuild 2202
+MD5 6131bc0df38cdb946967ceea9c8ffd0e xfs-sources-2.4.23-r1.ebuild 1257
 MD5 362ccecfa0cb07471317a27e762e7250 xfs-sources-2.4.19-r3.ebuild 2339
-MD5 f02e213426423fa9c483eb893ab9e0e0 xfs-sources-2.4.20-r4.ebuild 2322
-MD5 cf2e0b99ef5b683fff91d7d99e5f4904 ChangeLog 10784
-MD5 9d0457271fd1f3afdcf4f7ee602d3b34 metadata.xml 414
-MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
-MD5 d53055aeb748e8680c3232c405c5ec89 files/digest-xfs-sources-2.4.24 141
-MD5 a61e57d5483a06f20da339d91f98fbb8 files/xfs-sources-2.4.20.rtc_fix.patch 6769
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/xfs-sources-2.4.22.rtc_fix.patch 7073
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 174438d215b70cad5ffb00ca8123c062 files/xfs-sources-2.4.24.munmap.patch 837
-MD5 3afd3962750ab6706f9a9878a94cfd8d files/xfs-sources-2.4.20-gcc33.patch 10849
+MD5 4980429952168194a39b7656d909137a xfs-sources-2.4.20-r2.ebuild 2202
+MD5 7a1c98a028bb42e5e4cf1f24f4a41e46 xfs-sources-2.4.24-r2.ebuild 1137
+MD5 ccb24e8a4128475f97bf020f5b0a952a xfs-sources-2.4.20-r1.ebuild 2193
+MD5 6934c1007e4f6c56f2fa58ed7deef21e xfs-sources-2.4.24-r4.ebuild 1256
+MD5 bc1840b22fbca3216cc2d10679c534d7 xfs-sources-2.4.24-r1.ebuild 1073
+MD5 7502294f51542ace5d89419433107497 xfs-sources-2.4.20-r3.ebuild 2297
 MD5 b0c3e68e37892be35fc1c33723bbbdc3 files/xfs-sources-2.4.19.patch 497
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/xfs-sources.CAN-2003-0985.patch 414
-MD5 df40eece807d039cba79f477e80ebda2 files/xfs-sources-2.4.19.rtc_fix.patch 4974
-MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r3 142
-MD5 bb367b087129027dd816740e61f0e675 files/digest-xfs-sources-2.4.20-r1 142
+MD5 53da61155df6e5a6d0c8f57f0195e78a files/digest-xfs-sources-2.4.24-r3 144
 MD5 6c7dc3e61cee85185b45bc82e2982351 files/digest-xfs-sources-2.4.20-r2 142
-MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r3 142
-MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r4 142
-MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r5 142
+MD5 df40eece807d039cba79f477e80ebda2 files/xfs-sources-2.4.19.rtc_fix.patch 4974
+MD5 174438d215b70cad5ffb00ca8123c062 files/xfs-sources-2.4.24.munmap.patch 837
 MD5 f296f6804e8a1b632ff0939c10c66ea5 files/digest-xfs-sources-2.4.23-r1 141
+MD5 bb367b087129027dd816740e61f0e675 files/digest-xfs-sources-2.4.20-r1 142
+MD5 77f3799264c87379da9f7f2b23f20684 files/digest-xfs-sources-2.4.19-r3 142
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/xfs-sources.CAN-2003-0985.patch 414
+MD5 a61e57d5483a06f20da339d91f98fbb8 files/xfs-sources-2.4.20.rtc_fix.patch 6769
+MD5 d53055aeb748e8680c3232c405c5ec89 files/digest-xfs-sources-2.4.24 141
+MD5 a728d28dca69f5ae16aab56cd2fc6110 files/digest-xfs-sources-2.4.20 139
 MD5 24da024c498c1c154d80a7264e3a6fe9 files/digest-xfs-sources-2.4.24-r1 144
 MD5 24da024c498c1c154d80a7264e3a6fe9 files/digest-xfs-sources-2.4.24-r2 144
-MD5 53da61155df6e5a6d0c8f57f0195e78a files/digest-xfs-sources-2.4.24-r3 144
+MD5 21f3a4f186017d925067335e24db36a1 files/xfs-sources.CAN-2004-0109.patch 1877
+MD5 3afd3962750ab6706f9a9878a94cfd8d files/xfs-sources-2.4.20-gcc33.patch 10849
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/xfs-sources-2.4.22.rtc_fix.patch 7073
+MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r5 142
+MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r4 142
+MD5 739cbda7c5acadb95758e2f4d8194699 files/digest-xfs-sources-2.4.20-r3 142
+MD5 53da61155df6e5a6d0c8f57f0195e78a files/digest-xfs-sources-2.4.24-r4 144
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r4 b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r4
new file mode 100644
index 000000000000..981a129bcbef
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/digest-xfs-sources-2.4.24-r4
@@ -0,0 +1,2 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 572ff310d39ce7fd20568bf27299ded8 xfs-sources-2.4.24-r3.patch.bz2 1718289
diff --git a/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0109.patch b/sys-kernel/xfs-sources/files/xfs-sources.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/xfs-sources/files/xfs-sources.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/xfs-sources/xfs-sources-2.4.24-r4.ebuild b/sys-kernel/xfs-sources/xfs-sources-2.4.24-r4.ebuild
new file mode 100644
index 000000000000..c241d77d68c8
--- /dev/null
+++ b/sys-kernel/xfs-sources/xfs-sources-2.4.24-r4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xfs-sources/xfs-sources-2.4.24-r4.ebuild,v 1.1 2004/04/15 18:16:06 plasmaroo Exp $
+
+ETYPE="sources"
+
+inherit kernel eutils
+IUSE=""
+OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+EXTRAVERSION="-${PN/-*/}-${PR}"
+KV=${OKV}${EXTRAVERSION}
+
+S=${WORKDIR}/linux-${KV}
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/xfs-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the XFS Specialized Gentoo Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	http://dev.gentoo.org/~scox/kernels/v2.4/xfs-sources-${PV}-r3.patch.bz2"
+
+KEYWORDS="x86 -ppc -sparc"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die
+
+	cd linux-${KV}
+
+	bzcat ${DISTDIR}/xfs-sources-${PV}-r3.patch.bz2 | patch -p1 \
+		|| die "Failed to patch kernel"
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+
+	make mrproper || die "make mrproper failed"
+	kernel_universal_unpack
+}