Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities.

6 files changed, 39 insertions, 5 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index bf4b45eb25f6..0c7a868a180a 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/vserver-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.3 2004/04/15 12:58:28 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.4 2004/04/17 14:09:07 plasmaroo Exp $
+
+*vserver-sources-2.4.25.1.3.8-r2 (17 Apr 2004)
+
+  17 Apr 2004; <plasmaroo@gentoo.org>
+  +files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch,
+  +files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch,
+  -vserver-sources-2.4.25.1.3.8-r1.ebuild,
+  +vserver-sources-2.4.25.1.3.8-r2.ebuild:
+  Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities.
 
 *vserver-sources-2.4.25.1.3.8-r1 (15 Apr 2004)
 
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
index 791a69e2f913..d1a127ca790f 100644
--- a/sys-kernel/vserver-sources/Manifest
+++ b/sys-kernel/vserver-sources/Manifest
@@ -1,4 +1,6 @@
-MD5 bba08b336e6a7cb02048ff7bd825acb7 ChangeLog 743
-MD5 17cec9b648e5cb92570261b2def0e8a1 vserver-sources-2.4.25.1.3.8-r1.ebuild 1458
+MD5 bf26e6a00715ac579898c426661fea0a ChangeLog 1107
+MD5 733169a053d912d1dfbef677b3d1cb08 vserver-sources-2.4.25.1.3.8-r2.ebuild 1644
 MD5 21f3a4f186017d925067335e24db36a1 files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch 1877
-MD5 9c485dd51f9cf7c01f570363b79011be files/digest-vserver-sources-2.4.25.1.3.8-r1 138
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch 424
+MD5 9c485dd51f9cf7c01f570363b79011be files/digest-vserver-sources-2.4.25.1.3.8-r2 138
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch 384
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r1 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r2
index 051653be757b..051653be757b 100644
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r1
+++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r2
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch
new file mode 100644
index 000000000000..da6b7e190685
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch
@@ -0,0 +1,10 @@
+--- linux-2.4.26-pre3/fs/jbd/journal.c	2004-02-18 05:36:31.000000000 -0800
++++ linux-2.4.26-pre4/fs/jbd/journal.c	2004-03-16 09:59:36.000000000 -0800
+@@ -671,6 +671,7 @@
+ 
+ 	bh = getblk(journal->j_dev, blocknr, journal->j_blocksize);
+ 	lock_buffer(bh);
++	memset(bh->b_data, 0, journal->j_blocksize);
+ 	BUFFER_TRACE(bh, "return this buffer");
+ 	return journal_add_journal_head(bh);
+ }
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch
new file mode 100644
index 000000000000..19e57268c2fa
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.26-pre2/drivers/sound/sb_audio.c	2002-02-25 11:38:06.000000000 -0800
++++ linux-2.4.26-pre3/drivers/sound/sb_audio.c	2004-03-13 07:43:23.000000000 -0800
+@@ -879,7 +879,7 @@
+ 			c -= locallen; p += locallen;
+ 		}
+ 		/* used = ( samples * 16 bits size ) */
+-		*used = len << 1;
++		*used =  max_in  > ( max_out << 1) ? (max_out << 1) : max_in;
+ 		/* returned = ( samples * 8 bits size ) */
+ 		*returned = len;
+ 	}
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r1.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r2.ebuild
index 79fec8dcc248..3a514bc114ad 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r1.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r2.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/vserver-sources/vserver-sources-2.4.25.1.3.8-r1.ebuild,v 1.1 2004/04/15 12:58:28 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r2.ebuild,v 1.1 2004/04/17 14:09:07 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel
@@ -37,6 +37,8 @@ src_unpack() {
 	cd linux-${KV}${EXTRAVERSION}
 	epatch ${WORKDIR}/patch-${KV}${VEXTRAVERSION}.diff
 	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	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!"
 
 	kernel_universal_unpack
 }