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

8 files changed, 119 insertions, 15 deletions

diff --git a/sys-kernel/ia64-sources/ChangeLog b/sys-kernel/ia64-sources/ChangeLog
index 2e35c7484dfe..f423a8057a11 100644
--- a/sys-kernel/ia64-sources/ChangeLog
+++ b/sys-kernel/ia64-sources/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for sys-kernel/ia64-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.14 2004/04/27 22:00:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.15 2004/06/02 12:48:30 plasmaroo Exp $
+
+*ia64-sources-2.4.24-r4 (02 Jun 2004)
+
+  02 Jun 2004; <plasmaroo@gentoo.org> -ia64-sources-2.4.24-r3.ebuild,
+  +ia64-sources-2.4.24-r4.ebuild,
+  +files/ia64-sources-2.4.24.CAN-2004-...patch:
+  Added patches for the CAN-2004-0075, CAN-2004-0181, CAN-2004-0394, and
+  CAN-2004-0427 vulnerabilities. Bug #47881.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   ia64-sources-2.4.22-r1.ebuild, ia64-sources-2.4.22.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *ia64-sources-2.4.24-r3 (17 Apr 2004)
 
diff --git a/sys-kernel/ia64-sources/Manifest b/sys-kernel/ia64-sources/Manifest
index 6c0bae6e02f3..bb2ea85c3513 100644
--- a/sys-kernel/ia64-sources/Manifest
+++ b/sys-kernel/ia64-sources/Manifest
@@ -1,17 +1,21 @@
+MD5 5f5e0f439159e10a1ab04502b24a7a4a ChangeLog 2887
 MD5 539733c14abfa189b19da67d6a2c83f3 ia64-sources-2.4.22.ebuild 2386
-MD5 badd9ee29ef2651769b3f5c85df032de ia64-sources-2.4.22-r1.ebuild 2390
-MD5 d743dceb02d6b9b06916de484545f852 ChangeLog 2576
+MD5 8a2d05b96244126f502a287f01537b41 ia64-sources-2.4.24-r4.ebuild 3055
 MD5 5dc4ff456c76efb0df245744d903acf6 ia64-sources-2.4.22-r2.ebuild 2386
-MD5 98d226e44f7b60c6daf3a25f3ca7a9a3 ia64-sources-2.4.24-r3.ebuild 2690
+MD5 badd9ee29ef2651769b3f5c85df032de ia64-sources-2.4.22-r1.ebuild 2390
+MD5 174438d215b70cad5ffb00ca8123c062 files/ia64-sources-2.4.24.munmap.patch 837
+MD5 c460ea130cb4ae84a5063ba044e3ce72 files/ia64-sources-2.4.24.CAN-2004-0427.patch 460
 MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22 145
-MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22-r1 145
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 147fec50180ad91b6260fc7201dcb90f files/ia64-sources-2.4.24.CAN-2004-0010.patch 6050
+MD5 21f3a4f186017d925067335e24db36a1 files/ia64-sources-2.4.24.CAN-2004-0109.patch 1877
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/ia64-sources-2.4.24.CAN-2004-0178.patch 424
 MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22-r2 145
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/ia64-sources.CAN-2003-0985.patch 414
+MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22-r1 145
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ia64-sources.rtc_fix.patch 7073
-MD5 f3e36a8286727cbc47312bf4bf5f541e files/digest-ia64-sources-2.4.24-r3 144
-MD5 174438d215b70cad5ffb00ca8123c062 files/ia64-sources-2.4.24.munmap.patch 837
-MD5 21f3a4f186017d925067335e24db36a1 files/ia64-sources-2.4.24.CAN-2004-0109.patch 1877
-MD5 147fec50180ad91b6260fc7201dcb90f files/ia64-sources-2.4.24.CAN-2004-0010.patch 6050
+MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/ia64-sources-2.4.24.CAN-2004-0075.patch 634
+MD5 de75cfa969ed092578d9ddda6c5be334 files/ia64-sources-2.4.24.CAN-2004-0181.patch 1233
+MD5 d4a740ae56c2049247083af387a22a85 files/ia64-sources-2.4.24.CAN-2004-0394.patch 350
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/ia64-sources-2.4.24.CAN-2004-0177.patch 384
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/ia64-sources-2.4.24.CAN-2004-0178.patch 424
+MD5 f3e36a8286727cbc47312bf4bf5f541e files/digest-ia64-sources-2.4.24-r4 144
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/ia64-sources.CAN-2003-0985.patch 414
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r3 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r4
index 2af043964e41..2af043964e41 100644
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r3
+++ b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r4
diff --git a/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0075.patch b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0075.patch
new file mode 100644
index 000000000000..5c397deb9c46
--- /dev/null
+++ b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0075.patch
@@ -0,0 +1,25 @@
+--- linux-2.4.23/drivers/usb/vicam.c	2004-01-26 16:56:32.000000000 +0000
++++ linux-2.4.25/drivers/usb/vicam.c	2004-04-20 18:15:53.000000000 +0100
+@@ -601,12 +601,19 @@
+ 	case VIDIOCSWIN:
+ 		{
+ 
+-			struct video_window *vw = (struct video_window *) arg;
+-			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
++			struct video_window vw;
+ 
+-			if ( vw->width != 320 || vw->height != 240 )
++			if (copy_from_user(&vw, arg, sizeof(vw)))
++			{
+ 				retval = -EFAULT;
++				break;
++			}
++
++			DBG("VIDIOCSWIN %d x %d\n", vw->width, vw->height);
+ 			
++			if ( vw.width != 320 || vw.height != 240 )
++				retval = -EFAULT;
++
+ 			break;
+ 		}
+ 
diff --git a/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0181.patch b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0181.patch
new file mode 100644
index 000000000000..5f7f1441b268
--- /dev/null
+++ b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.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/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0394.patch b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.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/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0427.patch b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0427.patch
new file mode 100644
index 000000000000..ddc9610f67f8
--- /dev/null
+++ b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.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/ia64-sources/ia64-sources-2.4.24-r3.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.24-r4.ebuild
index a6c51d08ae0c..a6830b2fb9f8 100644
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.24-r3.ebuild
+++ b/sys-kernel/ia64-sources/ia64-sources-2.4.24-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/ia64-sources/ia64-sources-2.4.24-r3.ebuild,v 1.1 2004/04/17 11:44:12 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ia64-sources-2.4.24-r4.ebuild,v 1.1 2004/06/02 12:48:30 plasmaroo Exp $
 
 IUSE=""
 
@@ -55,9 +55,13 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap 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-0075.patch || die "Failed to add the CAN-2004-0075 patch!"
+	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-0181.patch || die "Failed to add the CAN-2004-0181 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!"
 	kernel_universal_unpack
 }