From 1b77f7d2e581aeeb3251690fd4b1a43f8738a8ea Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Sat, 17 Apr 2004 14:25:40 +0000 Subject: Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities. --- sys-kernel/win4lin-sources/ChangeLog | 12 ++++++-- sys-kernel/win4lin-sources/Manifest | 10 +++--- .../files/digest-win4lin-sources-2.4.25-r1 | 3 -- .../files/digest-win4lin-sources-2.4.25-r2 | 3 ++ .../win4lin-sources-2.4.25.CAN-2004-0177.patch | 10 ++++++ .../win4lin-sources-2.4.25.CAN-2004-0178.patch | 11 +++++++ .../win4lin-sources-2.4.25-r1.ebuild | 34 -------------------- .../win4lin-sources-2.4.25-r2.ebuild | 36 ++++++++++++++++++++++ 8 files changed, 76 insertions(+), 43 deletions(-) delete mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r1 create mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2 create mode 100644 sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0177.patch create mode 100644 sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0178.patch delete mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r1.ebuild create mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog index ad3afb1895c2..8c90833cfc68 100644 --- a/sys-kernel/win4lin-sources/ChangeLog +++ b/sys-kernel/win4lin-sources/ChangeLog @@ -1,10 +1,18 @@ # ChangeLog for sys-kernel/win4lin-sources # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.19 2004/04/17 07:21:20 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.20 2004/04/17 14:25:40 plasmaroo Exp $ + +*win4lin-sources-2.4.25-r2 (17 Apr 2004) + + 17 Apr 2004; + +files/win4lin-sources-2.4.25.CAN-2004-0177.patch, + +files/win4lin-sources-2.4.25.CAN-2004-0178.patch, + -win4lin-sources-2.4.25-r1.ebuild, +win4lin-sources-2.4.25-r2.ebuild: + Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities. 17 Apr 2004; Michael Sterrett win4lin-sources-2.6.5-r1.ebuild: - fix patch name (bug #48029) + Fixed patch name (bug #48029). *win4lin-sources-2.6.5-r1 (15 Apr 2004) diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest index 35e40063ffcf..a6597134fc49 100644 --- a/sys-kernel/win4lin-sources/Manifest +++ b/sys-kernel/win4lin-sources/Manifest @@ -1,8 +1,10 @@ -MD5 2f289c33e1eb385bf58e885617d6f34a ChangeLog 3496 -MD5 d0053eb4b69e6373c751d54050dd4fc5 win4lin-sources-2.4.25-r1.ebuild 1259 +MD5 5c3c2123ff52e1e19046d63d75580aca ChangeLog 3831 MD5 cf528b9f4bd112bf5960dcfa0cbcd4c3 win4lin-sources-2.6.5-r1.ebuild 2971 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290 -MD5 177ad02eb33303dd8f726a13d92c8057 files/digest-win4lin-sources-2.4.25-r1 201 -MD5 8c49da507801f5f67a2e08ee17ddedf6 files/digest-win4lin-sources-2.6.5-r1 207 +MD5 f45d03dc89b3cb9d3afb0b70a44e771a win4lin-sources-2.4.25-r2.ebuild 1445 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/win4lin-sources-2.6.5.CAN-2004-0109.patch 2072 +MD5 8c49da507801f5f67a2e08ee17ddedf6 files/digest-win4lin-sources-2.6.5-r1 207 MD5 21f3a4f186017d925067335e24db36a1 files/win4lin-sources-2.4.25.CAN-2004-0109.patch 1877 +MD5 ac42024b6e6ee1e2165914db4b22a61c files/win4lin-sources-2.4.25.CAN-2004-0178.patch 424 +MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/win4lin-sources-2.4.25.CAN-2004-0177.patch 384 +MD5 177ad02eb33303dd8f726a13d92c8057 files/digest-win4lin-sources-2.4.25-r2 201 diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r1 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r1 deleted file mode 100644 index 3df65a061aca..000000000000 --- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548 -MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483 -MD5 2e32d8f11d9ed98f919934fb8b705369 Kernel-Win4Lin3-2.4.25.patch 23600 diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2 new file mode 100644 index 000000000000..3df65a061aca --- /dev/null +++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2 @@ -0,0 +1,3 @@ +MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548 +MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483 +MD5 2e32d8f11d9ed98f919934fb8b705369 Kernel-Win4Lin3-2.4.25.patch 23600 diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0177.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0177.patch new file mode 100644 index 000000000000..da6b7e190685 --- /dev/null +++ b/sys-kernel/win4lin-sources/files/win4lin-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/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0178.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0178.patch new file mode 100644 index 000000000000..19e57268c2fa --- /dev/null +++ b/sys-kernel/win4lin-sources/files/win4lin-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/win4lin-sources/win4lin-sources-2.4.25-r1.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r1.ebuild deleted file mode 100644 index 3616e3e08b97..000000000000 --- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r1.ebuild +++ /dev/null @@ -1,34 +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/win4lin-sources/win4lin-sources-2.4.25-r1.ebuild,v 1.3 2004/04/15 23:36:58 plasmaroo Exp $ - -# OKV=original kernel version, KV=patched kernel version. They can be the same. - -IUSE="" -ETYPE="sources" -inherit kernel -OKV="2.4.25" -KV="2.4.25-win4lin-${PR}" -EXTRAVERSION="-win4lin-${PR}" - -S=${WORKDIR}/linux-${KV} - -DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support." -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - http://www.netraverse.com/member/downloads/files/mki-adapter.patch - http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch" -HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/" -KEYWORDS="x86" -SLOT="${KV}" - -src_unpack() { - unpack linux-${OKV}.tar.bz2 - mv linux-${OKV} linux-${KV} || die - - cd linux-${KV} - epatch ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch || die "Error: Win4Lin3 patch failed." - patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed." - epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!" - - kernel_universal_unpack -} diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild new file mode 100644 index 000000000000..346d87e821a4 --- /dev/null +++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild,v 1.1 2004/04/17 14:25:40 plasmaroo Exp $ + +# OKV=original kernel version, KV=patched kernel version. They can be the same. + +IUSE="" +ETYPE="sources" +inherit kernel +OKV="2.4.25" +KV="2.4.25-win4lin-${PR}" +EXTRAVERSION="-win4lin-${PR}" + +S=${WORKDIR}/linux-${KV} + +DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support." +SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 + http://www.netraverse.com/member/downloads/files/mki-adapter.patch + http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch" +HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/" +KEYWORDS="x86" +SLOT="${KV}" + +src_unpack() { + unpack linux-${OKV}.tar.bz2 + mv linux-${OKV} linux-${KV} || die + + cd linux-${KV} + epatch ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch || die "Error: Win4Lin3 patch failed." + patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed." + 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 +} -- cgit v1.2.3-65-gdbad