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

8 files changed, 98 insertions, 94 deletions

diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog
index af009cecb13c..5f8fa95875b3 100644
--- a/sys-kernel/gaming-sources/ChangeLog
+++ b/sys-kernel/gaming-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/gaming-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.18 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.19 2004/04/15 08:45:19 plasmaroo Exp $
+
+  15 Apr 2004; <plasmaroo@gentoo.org> gaming-sources-2.4.20-r9.ebuild,
+  files/gaming-sources-2.4.20.CAN-2004-0109.patch:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
   gaming-sources-2.4.20-r8.ebuild:
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r6 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r6
deleted file mode 100644
index f579357cc013..000000000000
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 b8d7ca0e2c2df2642e919b03e266cdeb patches-2.4.20-gaming-r5.tar.bz2 381905
-MD5 711f2443fb471404077403bfe3253f9b ck4_2.4.20.patch.bz2 1429780
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r8 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r8
deleted file mode 100644
index bb133846e255..000000000000
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 b8d7ca0e2c2df2642e919b03e266cdeb patches-2.4.20-gaming-r5.tar.bz2 381905
-MD5 0b0472793f452cd2e8c468eee44dca36 linux-2.4.20-ck7.patch.bz2 1308575
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r7 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r9
index bb133846e255..bb133846e255 100644
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r7
+++ b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r9
diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0109.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.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/gaming-sources/gaming-sources-2.4.20-r6.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r6.ebuild
deleted file mode 100644
index cb299d523cff..000000000000
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r6.ebuild
+++ /dev/null
@@ -1,39 +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/gaming-sources/gaming-sources-2.4.20-r6.ebuild,v 1.5 2004/01/24 19:22:55 plasmaroo Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-EXTRAVERSION="-gaming-r6"
-KV="${OKV}${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
-CKV=4_2.4.20
-
-DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/6/5}.tar.bz2 http://members.optusnet.com.au/ckolivas/kernel/ck${CKV}.patch.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-
-	unpack linux-${OKV}.tar.bz2 patches-${KV/6/5}.tar.bz2
-	bzcat ${DISTDIR}/ck${CKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV/6/5} || die #enter the patch directory and go!
-	kernel_src_unpack
-
-	epatch ${FILESDIR}/gaming-sources-2.4.20-gcc33.patch
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-}
diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.ebuild
deleted file mode 100644
index 7b1b61925d76..000000000000
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r7.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/gaming-sources/gaming-sources-2.4.20-r7.ebuild,v 1.4 2004/02/16 14:47:20 plasmaroo Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="2.4.20"
-EXTRAVERSION="-gaming-r7"
-KV="${OKV}${EXTRAVERSION}"
-S=${WORKDIR}/linux-${KV}
-CKV="2.4.20-ck7"
-
-DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel"
-HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/7/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-
-	unpack linux-${OKV}.tar.bz2 patches-${KV/7/5}.tar.bz2
-	bzcat ${DISTDIR}/linux-${CKV}.patch.bz2 | patch -p0 || die "-ck patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV/7/5} || die
-	rm 98_nforce2_agp.patch # In -ck7
-	kernel_src_unpack
-
-	epatch ${FILESDIR}/do_brk_fix.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-0001.patch || die "Failed to apply AMD64 ptrace patch!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-}
diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r8.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r9.ebuild
index 72c9c103d1c9..adecfc3745ef 100644
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r8.ebuild
+++ b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r9.ebuild
@@ -1,42 +1,42 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r8.ebuild,v 1.3 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r9.ebuild,v 1.1 2004/04/15 08:45:19 plasmaroo Exp $
 
 IUSE="build"
 
 # OKV=original kernel version, KV=patched kernel version.  
 
 ETYPE="sources"
-
 inherit kernel eutils
 
 OKV="2.4.20"
-EXTRAVERSION="-gaming-r8"
+EXTRAVERSION="-gaming-r9"
 KV="${OKV}${EXTRAVERSION}"
 S=${WORKDIR}/linux-${KV}
 CKV="2.4.20-ck7"
 
 DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/8/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/9/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2"
 
 KEYWORDS="x86"
 SLOT="${KV}"
 
 src_unpack() {
 
-	unpack linux-${OKV}.tar.bz2 patches-${KV/8/5}.tar.bz2
+	unpack linux-${OKV}.tar.bz2 patches-${KV/9/5}.tar.bz2
 	bzcat ${DISTDIR}/linux-${CKV}.patch.bz2 | patch -p0 || die "-ck patch failed"
 
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/8/5} || die
+	cd ${KV/9/5} || die
 	rm 98_nforce2_agp.patch # In -ck7
 	kernel_src_unpack
 
 	epatch ${FILESDIR}/do_brk_fix.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-0001.patch || die "Failed to apply AMD64 ptrace patch!"
+	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!"