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

4 files changed, 98 insertions, 3 deletions

diff --git a/sys-kernel/compaq-sources/ChangeLog b/sys-kernel/compaq-sources/ChangeLog
index ae00771a49dd..85f39dc72ceb 100644
--- a/sys-kernel/compaq-sources/ChangeLog
+++ b/sys-kernel/compaq-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/compaq-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/ChangeLog,v 1.4 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/ChangeLog,v 1.5 2004/04/15 08:17:06 plasmaroo Exp $
+
+*compaq-sources-2.4.9.32.7-r3 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org> compaq-sources-2.4.9.32.7-r2.ebuild,
+  compaq-sources-2.4.9.32.7-r3.ebuild,
+  files/compaq-sources-2.4.9.32.7.CAN-2004-0109.patch:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
   compaq-sources-2.4.9.32.7-r2.ebuild:
diff --git a/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r2.ebuild b/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r3.ebuild
index 7828a13fdb99..0651f68febfb 100644
--- a/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r2.ebuild
+++ b/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r2.ebuild,v 1.2 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r3.ebuild,v 1.1 2004/04/15 08:17:06 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
 OKV=2.4.9
 KV=${OKV}-32.7
-EXTRAVERSION="-compaq-r2"
+EXTRAVERSION="-compaq-${PR}"
 S=${WORKDIR}/linux-${KV}
 IUSE=""
 
@@ -54,6 +54,7 @@ src_unpack() {
 	# Security patches
 	epatch ${FILESDIR}/${P}.do_brk.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
 
diff --git a/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0109.patch b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.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/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r2 b/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r3
index 96283e409fc6..96283e409fc6 100644
--- a/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r2
+++ b/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r3