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. QA: Fixed ebuild.badheader; moved "Submitted by" data to the ChangeLog.

11 files changed, 112 insertions, 13 deletions

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index 004b1c881625..0220be018d20 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,15 +1,28 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.44 2004/05/01 20:39:56 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.45 2004/06/04 17:53:14 plasmaroo Exp $
+
+*wolk-sources-4.11-r4 (04 Jun 2004)
+
+  04 Jun 2004; <plasmaroo@gentoo.org> -wolk-sources-4.11-r3.ebuild,
+  +wolk-sources-4.11-r4.ebuild, +wolk-sources-4.14-r1.ebuild,
+  -wolk-sources-4.14.ebuild, -wolk-sources-4.9-r6.ebuild,
+  +wolk-sources-4.9-r7.ebuild, +files/wolk-sources.CAN-2004-0133.patch,
+  +files/wolk-sources.CAN-2004-0181.patch,
+  +files/wolk-sources.CAN-2004-0394.patch,
+  +files/wolk-sources.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.
 
   01 May 2004; Steve Arnold <nerdboy@gentoo.org> wolk-sources-4.14.ebuild:
-  added back old wolk arches (all ~)
+  Added back old wolk arches (all ~).
 
 *wolk-sources-4.14 (01 May 2004)
 
   01 May 2004; Steve Arnold <nerdboy@gentoo.org> wolk-sources-4.14.ebuild:
-  updated ebuild logic and new mcp patches (all known security issues have
-  been addressed by mcp).  Bumped 4.11 to x86.
+  Updated ebuild logic and new mcp patches (all known security issues have
+  been addressed by mcp).  Bumped 4.11 to x86. Submitted by Kerin Francis
+  Millar (kerframil) and Lance Albertson (Ramereth).
 
 *wolk-sources-4.11-r3 (17 Apr 2004)
 *wolk-sources-4.9-r6 (17 Apr 2004)
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r3 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r4
index c8b173eb8305..c8b173eb8305 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r3
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r4
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r1
index d05db224a1df..d05db224a1df 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r1
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r6 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r7
index 1a638cec623d..1a638cec623d 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r6
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r7
diff --git a/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0133.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0133.patch
new file mode 100644
index 000000000000..c756bc328bf2
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.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/wolk-sources/files/wolk-sources.CAN-2004-0181.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0181.patch
new file mode 100644
index 000000000000..5f7f1441b268
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0181.patch
@@ -0,0 +1,38 @@
+--- 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.22/fs/jfs/jfs_metapage.c.jfs-sec	2004-03-23 12:30:48.000000000 -0700
++++ linux-2.4.22/fs/jfs/jfs_metapage.c	2004-03-23 13:01:51.000000000 -0700
+@@ -375,6 +375,10 @@
+ 		}
+ 		mp->data = kmap(mp->page) + page_offset;
+ 	}
++
++	if (new)
++		memset(mp->data, 0, PSIZE);
++
+ 	jfs_info("__get_metapage: returning = 0x%p", mp);
+ 	return mp;
+ 
+--- linux-2.4.22/fs/jfs/super.c.jfs-sec	2004-03-23 12:31:10.000000000 -0700
++++ linux-2.4.22/fs/jfs/super.c	2004-03-23 13:01:51.000000000 -0700
+@@ -423,10 +423,10 @@
+ 
+ 	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_rwsem(&jfs_ip->rdwrlock);
+ 		init_MUTEX(&jfs_ip->commit_sem);
+-		jfs_ip->atlhead = 0;
+ 		jfs_ip->active_ag = -1;
+ 	}
+ }
diff --git a/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0394.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.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/wolk-sources/files/wolk-sources.CAN-2004-0427.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.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/wolk-sources/wolk-sources-4.11-r3.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r4.ebuild
index 7da6810d527d..f5871252c659 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.11-r3.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r4.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/wolk-sources/wolk-sources-4.11-r3.ebuild,v 1.2 2004/05/01 20:12:28 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r4.ebuild,v 1.1 2004/06/04 17:53:14 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -33,10 +33,13 @@ src_unpack() {
 	epatch ${DISTDIR}/linux-${OKV}-wolk4.10s-to-4.11s.patch.bz2 || die
 
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
-
+	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	kernel_universal_unpack
 }
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r1.ebuild
index 5d0d890641bc..833d68f3bb1a 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.14.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# Submitted by Kerin Francis Millar (kerframil) and Lance Albertson (Ramereth)
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r1.ebuild,v 1.1 2004/06/04 17:53:14 plasmaroo Exp $
 
 OKV="2.4.20"
 OKB="2.4"
-EXTRAVERSION="-${PN%-*}-${PV/$OKV./}"
+EXTRAVERSION="-${PN%-*}-${PV/$OKV./}-${PR}"
 KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 WOLK_SRC="linux-${OKV}-wolk${PV/${OKV}./}-fullkernel.tar.bz2"
@@ -25,6 +25,10 @@ mailing list: http://sourceforge.net/mailarchive/forum.php?forum_id=8245.
 Refer to the 2.4-WOLK-README file for further information. You will find
 this file in the directory containing the sources."
 
+UNIPATCH_LIST="${FILESDIR}/${PN}.CAN-2004-0133.patch
+	${FILESDIR}/${PN}.CAN-2004-0181.patch
+	${FILESDIR}/${PN}.CAN-2004-0394.patch"
+
 #============================================================================
 # We'll override the src_unpack() function from the eclass. This is necessary
 # due to the inclusion of optional patches in the sources. These cannot be
@@ -37,7 +41,7 @@ src_unpack() {
 	mv ${WOLK_DIR} linux-${KV} || die "Unable to move source tree to ${KV}."
 	cd ${S}
 
+	unipatch ${UNIPATCH_LIST}
 	universal_unpack
 	unpack_set_extraversion
-
 }
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r6.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r7.ebuild
index e1b263170d15..ec390c6c5080 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r6.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r7.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/wolk-sources/wolk-sources-4.9-r6.ebuild,v 1.1 2004/04/17 15:23:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r7.ebuild,v 1.1 2004/06/04 17:53:14 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -77,9 +77,13 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-4.9s.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${PN}-4.9s.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 
 	kernel_universal_unpack
 }
@@ -90,12 +94,13 @@ pkg_postinst() {
 	einfo "For many people they may work, but too many people expecting problems"
 	einfo "with this drivers. They will be reintroduced when they are fixed."
 	einfo "You have to fall back to an earlier release of the wolk kernel when you want"
-	einfo "to use one of this drivers."
+	einfo "to use one of these drivers."
 	einfo
 	einfo "This new ebuild has support for the workstation patches."
 	einfo "With the wolk-bootsplash, wolk-supermount, and"
 	einfo "ipv6 use flags you can take advantage of the"
 	einfo "Bootsplash, Supermount, and MIPv6 patches."
+	einfo
 	ewarn "Patches not guaranteed; YMMV..."
 	einfo
 }