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

14 files changed, 37 insertions, 245 deletions

diff --git a/sys-kernel/gs-sources/ChangeLog b/sys-kernel/gs-sources/ChangeLog
index 47f74e8a43d0..3e1f1e66aed9 100644
--- a/sys-kernel/gs-sources/ChangeLog
+++ b/sys-kernel/gs-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/gs-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.36 2004/04/15 18:51:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.37 2004/04/17 11:17:42 plasmaroo Exp $
+
+*gs-sources-2.4.25_pre7-r4 (17 Apr 2004)
+
+  17 Apr 2004; <plasmaroo@gentoo.org> +files/gs-sources.CAN-2004-0177.patch,
+  +files/gs-sources.CAN-2004-0178.patch, +gs-sources-2.4.25_pre7-r4.ebuild:
+  Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities.
+  Stale versions removed.
 
 *gs-sources-2.4.25_pre7-r3 (15 Apr 2004)
 
diff --git a/sys-kernel/gs-sources/Manifest b/sys-kernel/gs-sources/Manifest
index d5eccd5a7186..c665e78c9b73 100644
--- a/sys-kernel/gs-sources/Manifest
+++ b/sys-kernel/gs-sources/Manifest
@@ -1,23 +1,18 @@
-MD5 90408346ccac1a2497a3e3f8003e6aa6 ChangeLog 6796
-MD5 7dae5be4b0d6dc914fbab6fa62749884 gs-sources-2.4.25_pre7-r3.ebuild 2152
-MD5 4568148a3f1dfcc84b6957ac8c9978db gs-sources-2.4.25_pre7-r2.ebuild 2047
+MD5 c902422b4f21f8a6c9a1074027cbdecf ChangeLog 7091
 MD5 0b55d7ced9b928c9807df53ba3bd844f gs-sources-2.4.23_pre8-r2.ebuild 2197
-MD5 f7f093c841a07dcb1b6fbd9cf21e9b7c gs-sources-2.4.25_pre7-r1.ebuild 1957
 MD5 4df72e65b139d3e4c18bec81f3a561df metadata.xml 227
-MD5 e4fa233bf2ec7980c3bbf34e3447916c gs-sources-2.4.25_pre6.ebuild 1950
-MD5 f8446bbc2165fc60adcc98d46b4a4a78 gs-sources-2.4.25_pre7.ebuild 1951
+MD5 bffdfe062fada8f0f3a19d07bcd10bc3 gs-sources-2.4.25_pre7-r4.ebuild 2340
 MD5 185dc4dd817ed6c8909bd8709d990784 gs-sources-2.4.23_pre8-r1.ebuild 2011
+MD5 302215db36238af65fd57bd22db6d7ed files/digest-gs-sources-2.4.25_pre7-r4 147
 MD5 a56ba93e6d5df0f6298e9fc3b517424b files/digest-gs-sources-2.4.23_pre8-r1 144
-MD5 302215db36238af65fd57bd22db6d7ed files/digest-gs-sources-2.4.25_pre7-r1 147
 MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
-MD5 302215db36238af65fd57bd22db6d7ed files/digest-gs-sources-2.4.25_pre7-r3 147
 MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877
 MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gs-sources.rtc_fix.patch 7073
-MD5 8f9a994ab4629eb140948142fad4a42a files/digest-gs-sources-2.4.25_pre7 144
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gs-sources.CAN-2004-0177.patch 384
 MD5 a3ec1083055b245758b2262dd2245145 files/pci.ids.patch 3376
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gs-sources.CAN-2003-0985.patch 414
 MD5 453c6a41c6c505e5f04c3885f54278c7 files/gs-sources-2.4.23_pre8-af_irda.patch 701
 MD5 a56ba93e6d5df0f6298e9fc3b517424b files/digest-gs-sources-2.4.23_pre8-r2 144
-MD5 968253d8d1e89885c1931bc599aac380 files/digest-gs-sources-2.4.25_pre6 144
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/gs-sources.CAN-2004-0178.patch 424
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre6 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre6
deleted file mode 100644
index c671b29070d3..000000000000
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 e0df5228437aa4ba10587740dd20d9da patches-2.4.25_pre6-gss.tar.bz2 2658619
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7
deleted file mode 100644
index 2d3131eee6d3..000000000000
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 f8954de0ab25a3d9f51fc3f1ee0122c3 patches-2.4.25_pre7-gss.tar.bz2 2446434
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r2 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r2
deleted file mode 100644
index f55b28665921..000000000000
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 b495ed667a518227f82e76229b9f23e6 patches-2.4.25_pre7-gss-r1.tar.bz2 2475971
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r3 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r3
deleted file mode 100644
index f55b28665921..000000000000
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 b495ed667a518227f82e76229b9f23e6 patches-2.4.25_pre7-gss-r1.tar.bz2 2475971
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r1 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r4
index f55b28665921..f55b28665921 100644
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r1
+++ b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r4
diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0177.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0177.patch
new file mode 100644
index 000000000000..da6b7e190685
--- /dev/null
+++ b/sys-kernel/gs-sources/files/gs-sources.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/gs-sources/files/gs-sources.CAN-2004-0178.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0178.patch
new file mode 100644
index 000000000000..19e57268c2fa
--- /dev/null
+++ b/sys-kernel/gs-sources/files/gs-sources.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/gs-sources/gs-sources-2.4.25_pre6.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre6.ebuild
deleted file mode 100644
index 0a0e0b01ed26..000000000000
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre6.ebuild
+++ /dev/null
@@ -1,56 +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/gs-sources/gs-sources-2.4.25_pre6.ebuild,v 1.2 2004/01/26 12:09:23 livewire Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel
-PROVIDE="virtual/linux-sources virtual/winkernel"
-OKV=2.4.24
-EXTRAVERSION=_pre6-gss
-KV=2.4.25_pre6-gss
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="This kernel stays up to date with current kernel -pres,
-	with recent acpi,evms,win3lin ,futexes,aic79xx,
-	superfreeswan,preempt/ll, and various hw fixes."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd ${KV} || die
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-}
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r1.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r1.ebuild
deleted file mode 100644
index 1aadbdfb2a0d..000000000000
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r1.ebuild
+++ /dev/null
@@ -1,56 +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/gs-sources/gs-sources-2.4.25_pre7-r1.ebuild,v 1.2 2004/02/18 19:56:45 plasmaroo Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel
-PROVIDE="virtual/linux-sources virtual/winkernel"
-OKV=2.4.24
-EXTRAVERSION=_pre7-gss-r1
-KV=2.4.25_pre7-gss-r1
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="This kernel stays up to date with current kernel -pres,
-	with recent acpi,evms,win4lin ,futexes,aic79xx,
-	superfreeswan,preempt, and various hw fixes."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd ${KV} || die
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-}
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r2.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r2.ebuild
deleted file mode 100644
index 245a3ccea177..000000000000
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r2.ebuild
+++ /dev/null
@@ -1,57 +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/gs-sources/gs-sources-2.4.25_pre7-r2.ebuild,v 1.2 2004/04/12 16:36:22 aliz Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-PROVIDE="virtual/linux-sources virtual/winkernel"
-OKV=2.4.24
-EXTRAVERSION=_pre7-gss-r2
-KV=2.4.25_pre7-gss-r2
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="This kernel stays up to date with current kernel -pres,
-	with recent acpi,evms,win4lin,futexes,aic79xx,
-	superfreeswan,preempt, and various hw fixes."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV/r2/r1}.tar.bz2"
-KEYWORDS="x86 -ppc -sparc"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd ${KV/r2/r1} || die
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-	epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!"
-}
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r3.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r4.ebuild
index ac073963f878..d975e22ae140 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r3.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-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/gs-sources/gs-sources-2.4.25_pre7-r3.ebuild,v 1.1 2004/04/15 18:51:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r4.ebuild,v 1.1 2004/04/17 11:17:42 plasmaroo Exp $
 
 IUSE="build crypt"
 
@@ -55,4 +55,6 @@ src_unpack() {
 	kernel_src_unpack
 	epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	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!"
 }
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7.ebuild
deleted file mode 100644
index 8cac258b1d85..000000000000
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7.ebuild
+++ /dev/null
@@ -1,56 +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/gs-sources/gs-sources-2.4.25_pre7.ebuild,v 1.1 2004/01/23 22:31:25 livewire Exp $
-
-IUSE="build crypt"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel
-PROVIDE="virtual/linux-sources virtual/winkernel"
-OKV=2.4.24
-EXTRAVERSION=_pre7-gss
-KV=2.4.25_pre7-gss
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gs-sources-${PV}/patches.txt.gz
-
-DESCRIPTION="This kernel stays up to date with current kernel -pres,
-	with recent acpi,evms,win3lin ,futexes,aic79xx,
-	superfreeswan,preempt/ll, and various hw fixes."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV}.tar.bz2"
-KEYWORDS="~x86 -ppc -sparc "
-SLOT="${KV}"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd ${KV} || die
-	# Kill patches we aren't suppposed to use, don't worry about
-	# failures, if they aren't there that is a good thing!
-	# This is the ratified crypt USE flag, enables IPSEC and patch-int
-	if [ -z "`use crypt`" ]; then
-		einfo "No Cryptographic support, dropping patches..."
-		for file in 8*;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Cryptographic support enabled..."
-	fi
-
-	kernel_src_unpack
-}