Fix for CAN-2004-0596, Gentoo bug #57826

5 files changed, 97 insertions, 17 deletions

diff --git a/sys-kernel/hardened-dev-sources/ChangeLog b/sys-kernel/hardened-dev-sources/ChangeLog
index cbd44cc076f9..3f3f8870fae8 100644
--- a/sys-kernel/hardened-dev-sources/ChangeLog
+++ b/sys-kernel/hardened-dev-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/hardened-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.28 2004/07/14 01:42:06 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.29 2004/07/24 13:12:10 tseng Exp $
+
+*hardened-dev-sources-2.6.7-r4 (24 Jul 2004)
+
+  24 Jul 2004; Brandon Hale <tseng@gentoo.org>
+  +files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch,
+  +hardened-dev-sources-2.6.7-r4.ebuild:
+  Fix for CAN-2004-0596, Gentoo bug #57826
 
 *hardened-dev-sources-2.6.7-r3 (13 Jul 2004)
 
diff --git a/sys-kernel/hardened-dev-sources/Manifest b/sys-kernel/hardened-dev-sources/Manifest
index 1b045e48c2bc..bc827921479d 100644
--- a/sys-kernel/hardened-dev-sources/Manifest
+++ b/sys-kernel/hardened-dev-sources/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d33b1d0c8a793a7ae43ddce005a8bdce hardened-dev-sources-2.6.7-r2.ebuild 1091
 MD5 1c165d5bd7931e3fea5b2d807c7ab1a0 hardened-dev-sources-2.6.5-r5.ebuild 1024
-MD5 a1d72a54847dda12d92b5931049350fc hardened-dev-sources-2.6.7-r1.ebuild 1091
-MD5 684c916055768f4ea2fd42beedf22275 hardened-dev-sources-2.6.7-r3.ebuild 1092
 MD5 80fbf21bf012a796aee1b949e8d5090f ChangeLog 4742
-MD5 73174f8e07b82c5df563b7196f87611c metadata.xml 299
+MD5 d33b1d0c8a793a7ae43ddce005a8bdce hardened-dev-sources-2.6.7-r2.ebuild 1091
+MD5 a1d72a54847dda12d92b5931049350fc hardened-dev-sources-2.6.7-r1.ebuild 1091
 MD5 1d8e512be1a377d00f7c106f7ce29cd1 hardened-dev-sources-2.6.7.ebuild 1088
+MD5 0937855aeaa885c4e2ae156110824647 hardened-dev-sources-2.6.7-r4.ebuild 1152
+MD5 73174f8e07b82c5df563b7196f87611c metadata.xml 299
+MD5 684c916055768f4ea2fd42beedf22275 hardened-dev-sources-2.6.7-r3.ebuild 1092
 MD5 66d5063a0b920237d9a5e19755080970 files/digest-hardened-dev-sources-2.6.7 219
+MD5 8204afea1d572b49a4a80d8da4eef0c9 files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch 1033
+MD5 8a633b7ae59dbda43f56c79aeeaa5d55 files/digest-hardened-dev-sources-2.6.7-r3 219
 MD5 c811d0dd14e749265a965a2eac4d3629 files/digest-hardened-dev-sources-2.6.5-r5 220
-MD5 0db04ba77df8109b2ebd969db220f460 files/digest-hardened-dev-sources-2.6.7-r1 219
 MD5 c62f36f3cf377415226f1ffbe716be4e files/digest-hardened-dev-sources-2.6.7-r2 219
-MD5 8a633b7ae59dbda43f56c79aeeaa5d55 files/digest-hardened-dev-sources-2.6.7-r3 219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA9I+4I9RrrOsOLvcRAulkAJ0aSgXGk2MBV0Nl07erAfCFjT+00QCdG4bB
-ppqNP97TxT/kkKHaOecQf58=
-=po9V
------END PGP SIGNATURE-----
+MD5 0db04ba77df8109b2ebd969db220f460 files/digest-hardened-dev-sources-2.6.7-r1 219
+MD5 8a633b7ae59dbda43f56c79aeeaa5d55 files/digest-hardened-dev-sources-2.6.7-r4 219
diff --git a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r4 b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r4
new file mode 100644
index 000000000000..413adfe20205
--- /dev/null
+++ b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r4
@@ -0,0 +1,3 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 6eedda7e989595126f9dd2581a16a88a hardened-patches-2.6-7.5.tar.bz2 131095
+MD5 0117510c017242e76a2055fcaf015f4d genpatches-2.6-7.40-base.tar.bz2 21638
diff --git a/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch b/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch
new file mode 100644
index 000000000000..3e20a2e41372
--- /dev/null
+++ b/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch
@@ -0,0 +1,46 @@
+--- 1.13/drivers/net/eql.c	2004-07-21 03:13:40 -07:00
++++ 1.14/drivers/net/eql.c	2004-07-21 03:13:40 -07:00
+@@ -495,6 +495,8 @@
+ 		return -EFAULT;
+ 
+ 	slave_dev = dev_get_by_name(sc.slave_name);
++	if (!slave_dev)
++		return -ENODEV;
+ 
+ 	ret = -EINVAL;
+ 
+@@ -527,11 +529,13 @@
+ 	if (copy_from_user(&sc, scp, sizeof (slave_config_t)))
+ 		return -EFAULT;
+ 
+-	eql = dev->priv;
+ 	slave_dev = dev_get_by_name(sc.slave_name);
++	if (!slave_dev)
++		return -ENODEV;
+ 
+ 	ret = -EINVAL;
+ 
++	eql = dev->priv;
+ 	spin_lock_bh(&eql->queue.lock);
+ 	if (eql_is_slave(slave_dev)) {
+ 		slave = __eql_find_slave_dev(&eql->queue, slave_dev);
+--- 1.14/drivers/net/eql.c	2004-07-21 03:13:33 -07:00
++++ 1.15/drivers/net/eql.c	2004-07-21 03:13:33 -07:00
+@@ -499,6 +499,8 @@
+ 		return -ENODEV;
+ 
+ 	ret = -EINVAL;
++	if (!slave_dev)
++		return ret;
+ 
+ 	spin_lock_bh(&eql->queue.lock);
+ 	if (eql_is_slave(slave_dev)) {
+@@ -534,6 +536,8 @@
+ 		return -ENODEV;
+ 
+ 	ret = -EINVAL;
++	if (!slave_dev)
++		return ret;
+ 
+ 	eql = dev->priv;
+ 	spin_lock_bh(&eql->queue.lock);
diff --git a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r4.ebuild b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r4.ebuild
new file mode 100644
index 000000000000..f5ff7a74714e
--- /dev/null
+++ b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r4.ebuild,v 1.1 2004/07/24 13:12:10 tseng Exp $
+
+IUSE=""
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+GPV=7.40
+GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
+
+HGPV=7.5
+#HGPV_SRC="mirror://gentoo/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+HGPV_SRC="http://dev.gentoo.org/~tseng/kernel/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_EXCLUDE="1315_alpha"
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2
+	${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
+	${FILESDIR}/hardened-dev-sources-2.6.7.CAN-2004-0596.patch"
+UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
+
+DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+pkg_postinst() {
+	postinst_sources
+}