Added patches for the CAN-2004-0394 and CAN-2004-0427 vulnerabilities. Bug #47881.

5 files changed, 40 insertions, 4 deletions

diff --git a/sys-kernel/compaq-sources/ChangeLog b/sys-kernel/compaq-sources/ChangeLog
index c72cfdaf6032..e0f397d45f95 100644
--- a/sys-kernel/compaq-sources/ChangeLog
+++ b/sys-kernel/compaq-sources/ChangeLog
@@ -1,6 +1,15 @@
 # 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.6 2004/04/17 09:35:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/ChangeLog,v 1.7 2004/05/29 10:54:40 plasmaroo Exp $
+
+*compaq-sources-2.4.9.32.7-r5 (29 May 2004)
+
+  29 May 2004; <plasmaroo@gentoo.org> -compaq-sources-2.4.9.32.7-r4.ebuild,
+  +compaq-sources-2.4.9.32.7-r5.ebuild,
+  +files/compaq-sources-2.4.9.32.7.CAN-2004-0394.patch,
+  +files/compaq-sources-2.4.9.32.7.CAN-2004-0427.patch:
+  Added patches for the CAN-2004-0394 and CAN-2004-0427 vulnerabilities. Bug
+  #47881.
 
 *compaq-sources-2.4.9.32.7-r4 (17 Apr 2004)
 
diff --git a/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r4.ebuild b/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r5.ebuild
index 74ee45003873..784f35c1d288 100644
--- a/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r4.ebuild
+++ b/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r5.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/compaq-sources/compaq-sources-2.4.9.32.7-r4.ebuild,v 1.1 2004/04/17 09:35:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r5.ebuild,v 1.1 2004/05/29 10:54:40 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -52,12 +52,14 @@ src_unpack() {
 	sed -i 's#/DISCARD/ : { \*(.text.exit)#/DISCARD/ : {#' arch/alpha/vmlinux.lds.in
 
 	# 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-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-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-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+	epatch ${FILESDIR}/${P}.do_brk.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/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0394.patch b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.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/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0427.patch b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.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/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r4 b/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r5
index 96283e409fc6..96283e409fc6 100644
--- a/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r4
+++ b/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r5