8 files changed, 40 insertions, 29 deletions
diff --git a/sys-kernel/selinux-sources/ChangeLog b/sys-kernel/selinux-sources/ChangeLog
index b020f2dee998..43da344f854f 100644
--- a/sys-kernel/selinux-sources/ChangeLog
+++ b/sys-kernel/selinux-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/selinux-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.34 2004/04/15 06:44:07 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.35 2004/04/17 13:35:22 plasmaroo Exp $
+
+*selinux-sources-2.4.25-r2 (17 Apr 2004)
+
+  17 Apr 2004; <plasmaroo@gentoo.org>
+  +files/selinux-sources-2.4.25.CAN-2004-0177.patch,
+  +files/selinux-sources-2.4.25.CAN-2004-0178.patch,
+  -selinux-sources-2.4.25-r1.ebuild, +selinux-sources-2.4.25-r2.ebuild,
+  -selinux-sources-2.4.25.ebuild:
+  Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities. Old
+  revisions removed.
 
 *selinux-sources-2.4.25-r1 (15 Apr 2004)
 
diff --git a/sys-kernel/selinux-sources/Manifest b/sys-kernel/selinux-sources/Manifest
index 31a995076c4c..f2d8a230eeee 100644
--- a/sys-kernel/selinux-sources/Manifest
+++ b/sys-kernel/selinux-sources/Manifest
@@ -1,10 +1,10 @@
-MD5 c756948134fb849bff1dcdd8b0930d1f ChangeLog 5269
+MD5 6a64aec5bf6ca65bdc3b445d17460ef4 ChangeLog 5660
 MD5 f455fbb5d96167058282b93599457a4f metadata.xml 470
 MD5 20ea8dd17795fe9e56ab24041a3e793d selinux-sources-2.4.24-r2.ebuild 994
-MD5 f91110b92d87d6bb06df28df9df46335 selinux-sources-2.4.25.ebuild 675
-MD5 6be1a9b2363a38e42ae2e891eb514770 selinux-sources-2.4.25-r1.ebuild 727
-MD5 5b59de8931749376328efcb2798be298 files/digest-selinux-sources-2.4.25 145
-MD5 5b59de8931749376328efcb2798be298 files/digest-selinux-sources-2.4.25-r1 145
+MD5 17016435906e398e97736dea9a4c44de selinux-sources-2.4.25-r2.ebuild 801
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/selinux-sources-2.4.25.CAN-2004-0178.patch 424
+MD5 5b59de8931749376328efcb2798be298 files/digest-selinux-sources-2.4.25-r2 145
 MD5 69447df9da3cc0678dc94d99e514d93d files/digest-selinux-sources-2.4.24-r2 145
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/selinux-sources-2.4.25.CAN-2004-0177.patch 384
 MD5 174438d215b70cad5ffb00ca8123c062 files/selinux-sources-2.4.24.munmap.patch 837
 MD5 21f3a4f186017d925067335e24db36a1 files/selinux-sources-2.4.25.CAN-2004-0109.patch 1877
diff --git a/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25-r1 b/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25-r1
deleted file mode 100644
index 9a1d26dec8c8..000000000000
--- a/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 a3c129098f00350e7b248cad56d89913 patches-2.4.25-selinux-r0.tar.bz2 166679
diff --git a/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25 b/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25-r2
index 9a1d26dec8c8..9a1d26dec8c8 100644
--- a/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25
+++ b/sys-kernel/selinux-sources/files/digest-selinux-sources-2.4.25-r2
diff --git a/sys-kernel/selinux-sources/files/selinux-sources-2.4.25.CAN-2004-0177.patch b/sys-kernel/selinux-sources/files/selinux-sources-2.4.25.CAN-2004-0177.patch
new file mode 100644
index 000000000000..da6b7e190685
--- /dev/null
+++ b/sys-kernel/selinux-sources/files/selinux-sources-2.4.25.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/selinux-sources/files/selinux-sources-2.4.25.CAN-2004-0178.patch b/sys-kernel/selinux-sources/files/selinux-sources-2.4.25.CAN-2004-0178.patch
new file mode 100644
index 000000000000..19e57268c2fa
--- /dev/null
+++ b/sys-kernel/selinux-sources/files/selinux-sources-2.4.25.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/selinux-sources/selinux-sources-2.4.25-r1.ebuild b/sys-kernel/selinux-sources/selinux-sources-2.4.25-r2.ebuild
index 91c18a2e9627..519598aa6f9d 100644
--- a/sys-kernel/selinux-sources/selinux-sources-2.4.25-r1.ebuild
+++ b/sys-kernel/selinux-sources/selinux-sources-2.4.25-r2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.25-r1.ebuild,v 1.1 2004/04/15 06:44:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.25-r2.ebuild,v 1.1 2004/04/17 13:35:22 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
 detect_version
 IUSE=""
 
-GPV_SRC="mirror://gentoo/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR/1/0}.tar.bz2"
+GPV_SRC="mirror://gentoo/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR/2/0}.tar.bz2"
 KEYWORDS="-* x86"
 
-UNIPATCH_LIST="${DISTDIR}/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR/1/0}.tar.bz2 ${FILESDIR}/${P}.CAN-2004-0109.patch"
+UNIPATCH_LIST="${DISTDIR}/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR/2/0}.tar.bz2 ${FILESDIR}/${P}.CAN-2004-0109.patch ${FILESDIR}/${P}.CAN-2004-0177.patch ${FILESDIR}/${P}.CAN-2004-0178.patch"
 
 DESCRIPTION="Base ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} SELinux kernel"
 SRC_URI="${KERNEL_URI} ${GPV_SRC}"
diff --git a/sys-kernel/selinux-sources/selinux-sources-2.4.25.ebuild b/sys-kernel/selinux-sources/selinux-sources-2.4.25.ebuild
deleted file mode 100644
index f362a2c7addb..000000000000
--- a/sys-kernel/selinux-sources/selinux-sources-2.4.25.ebuild
+++ /dev/null
@@ -1,18 +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/selinux-sources/selinux-sources-2.4.25.ebuild,v 1.3 2004/04/14 07:14:07 aliz Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-IUSE=""
-
-GPV_SRC="mirror://gentoo/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR}.tar.bz2"
-
-KEYWORDS="-* x86"
-
-UNIPATCH_LIST="${DISTDIR}/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR}.tar.bz2"
-
-DESCRIPTION="Base ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} SELinux kernel"
-SRC_URI="${KERNEL_URI} ${GPV_SRC}"
-HOMEPAGE="http://www.kernel.org/ http://www.nsa.gov/selinux"