Added patches for the CAN-2004-0133, CAN-2004-0181, CAN-2004-0394 and CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of sources removed.

9 files changed, 95 insertions, 55 deletions

diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog
index 408a293f4e91..2fd8aac4718f 100644
--- a/sys-kernel/gaming-sources/ChangeLog
+++ b/sys-kernel/gaming-sources/ChangeLog
@@ -1,10 +1,22 @@
 # 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.21 2004/04/27 21:57:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.22 2004/05/29 13:28:37 plasmaroo Exp $
+
+*gaming-sources-2.4.20-r11 (29 May 2004)
+
+  29 May 2004; <plasmaroo@gentoo.org> -gaming-sources-2.4.20-r10.ebuild,
+  +gaming-sources-2.4.20-r11.ebuild, -gaming-sources-2.4.20-r5.ebuild,
+  +files/gaming-sources-2.4.20.CAN-2004-0133.patch,
+  +files/gaming-sources-2.4.20.CAN-2004-0181.patch,
+  +files/gaming-sources-2.4.20.CAN-2004-0394.patch,
+  +files/gaming-sources-2.4.20.CAN-2004-0427.patch:
+  Added patches for the CAN-2004-0133, CAN-2004-0181, CAN-2004-0394 and
+  CAN-2004-0427 vulnerabilities. Bug #47881. Old versions of sources
+  removed.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   gaming-sources-2.4.20-r5.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *gaming-sources-2.4.20-r10 (17 Apr 2004)
 
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r10 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r11
index bb133846e255..bb133846e255 100644
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r10
+++ b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r11
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r5 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r5
deleted file mode 100644
index f579357cc013..000000000000
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r5
+++ /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/gaming-sources-2.4.20.CAN-2004-0133.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0133.patch
new file mode 100644
index 000000000000..c756bc328bf2
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0133.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22/fs/xfs/xfs_log.c.can-2004-0133	2004-03-23 12:28:11.000000000 -0700
++++ linux-2.4.22/fs/xfs/xfs_log.c	2004-03-23 12:58:59.000000000 -0700
+@@ -1251,7 +1251,7 @@
+ 			  kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP);
+ 		iclog = *iclogp;
+ 		iclog->hic_data = (xlog_in_core_2_t *)
+-			  kmem_alloc(iclogsize, KM_SLEEP);
++			  kmem_zalloc(iclogsize, KM_SLEEP);
+ 
+ 		iclog->ic_prev = prev_iclog;
+ 		prev_iclog = iclog;
diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0181.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0181.patch
new file mode 100644
index 000000000000..3d44c0fd0880
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0181.patch
@@ -0,0 +1,34 @@
+--- linux-2.4.22/fs/jfs/jfs_logmgr.c.jfs-sec	2004-03-23 12:30:35.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_logmgr.c	2004-03-23 13:01:51.000000000 -0700
+@@ -1693,7 +1693,7 @@
+ 		if (lbuf == 0)
+ 			goto error;
+ 		lbuf->l_bh.b_data = lbuf->l_ldata =
+-		    (char *) __get_free_page(GFP_KERNEL);
++		    (char *) get_zeroed_page(GFP_KERNEL);
+ 		if (lbuf->l_ldata == 0) {
+ 			kfree(lbuf);
+ 			goto error;
+--- linux-2.4.20/fs/jfs/jfs_metapage.c	2002-11-28 23:53:15.000000000 +0000
++++ linux-2.4.20/fs/jfs/jfs_metapage.c.plasmaroo	2004-05-29 13:36:44.575503152 +0100
+@@ -379,6 +379,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if(new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jFYI(1, ("__get_metapage: returning = 0x%p\n", mp));
+ 	return mp;
+ 
+--- linux-2.4.20/fs/jfs/super.c	2002-11-28 23:53:15.000000000 +0000
++++ linux-2.4.20/fs/jfs/super.c.plasmaroo	2004-05-29 13:39:36.898306104 +0100
+@@ -373,6 +373,7 @@
+ 
+ 	if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) ==
+ 	    SLAB_CTOR_CONSTRUCTOR) {
++		memset(jfs_ip, 0, sizeof(struct jfs_inode_info));
+ 		INIT_LIST_HEAD(&jfs_ip->anon_inode_list);
+ 		INIT_LIST_HEAD(&jfs_ip->mp_list);
+ 		init_rwsem(&jfs_ip->rdwrlock);
diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0394.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0394.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
++++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
+@@ -51,7 +51,7 @@
+ 
+ 	bust_spinlocks(1);
+ 	va_start(args, fmt);
+-	vsprintf(buf, fmt, args);
++	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0427.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.CAN-2004-0427.patch
@@ -0,0 +1,14 @@
+diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c
+--- linux-2.4.25/kernel/fork.c	2004-02-18 05:36:32.000000000 -0800
++++ linux-2.4.25-new/kernel/fork.c	2004-04-07 17:43:29.000000000 -0700
+@@ -825,8 +825,10 @@
+ bad_fork_cleanup_namespace:
+ 	exit_namespace(p);
+ bad_fork_cleanup_mm:
+ 	exit_mm(p);
++	if (p->active_mm)
++		mmdrop(p->active_mm);
+ bad_fork_cleanup_sighand:
+ 	exit_sighand(p);
+ bad_fork_cleanup_fs:
+ 	exit_fs(p); /* blocking */
diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r10.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r11.ebuild
index 8a4570d5cce6..fb13f1c0e3f9 100644
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r10.ebuild
+++ b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r11.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/gaming-sources/gaming-sources-2.4.20-r10.ebuild,v 1.1 2004/04/17 09:48:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r11.ebuild,v 1.1 2004/05/29 13:28:37 plasmaroo Exp $
 
 IUSE="build"
 
@@ -10,37 +10,39 @@ ETYPE="sources"
 inherit kernel eutils
 
 OKV="2.4.20"
-EXTRAVERSION="-gaming-r10"
+EXTRAVERSION="-gaming-${PR}"
 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/10/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/11/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/10/5}.tar.bz2
+	unpack linux-${OKV}.tar.bz2 patches-${KV/11/5}.tar.bz2
 	bzcat ${DISTDIR}/linux-${CKV}.patch.bz2 | patch -p0 || die "-ck patch failed"
 
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/10/5} || die
+	cd ${KV/11/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-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0075 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0075 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0075 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0075 patch!"
+	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() 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/gaming-sources/gaming-sources-2.4.20-r5.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r5.ebuild
deleted file mode 100644
index 2891c89a647f..000000000000
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r5.ebuild
+++ /dev/null
@@ -1,41 +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-r5.ebuild,v 1.12 2004/04/27 21:57:58 agriffis Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel eutils
-
-OKV="2.4.20"
-EXTRAVERSION="-gaming-r5"
-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="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV}.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}.tar.bz2
-	bzcat ${DISTDIR}/ck${CKV}.patch.bz2 | patch -p0 || die "-patch failed"
-
-	mv linux-${OKV} linux-${KV} || die
-
-	cd ${KV} || die #enter the patch directory and go!
-	kernel_src_unpack
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
-	# Bug #32135
-	sed -i '1201d' ../linux-${KV}/drivers/net/fealnx.c
-
-}