Added a patch for the CAN-2004-0596 issue; bug #57826.

4 files changed, 56 insertions, 5 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index c79d7823918d..8233129e844d 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.43 2004/07/09 13:39:01 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.44 2004/07/21 10:28:49 plasmaroo Exp $
+
+  21 Jul 2004; <plasmaroo@gentoo.org> ck-sources-2.6.7-r5.ebuild,
+  +files/ck-sources-2.6.7.CAN-2004-0596.patch:
+  Added a patch for the CAN-2004-0596 issue; bug #57826.
 
 *ck-sources-2.6.7-r5 (09 Jul 2004)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index da13f13fe226..994f6385e149 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,11 +1,12 @@
-MD5 01909136f2bfaab999f36bf847f28e70 ChangeLog 7704
-MD5 952547abac9371770841aa25585fab97 ck-sources-2.6.7-r5.ebuild 1075
+MD5 ec29d4a37e8a476a64f19a77ac5ad6e9 ChangeLog 7875
+MD5 6406b8bc8fc9c39bc398d1c7736b2b7d ck-sources-2.6.7-r5.ebuild 1112
 MD5 173acbf1e579d26e6c8368ceff1f0299 ck-sources-2.4.26-r1.ebuild 2588
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 9e5d1d1be7fe9276125cb13f5ab8f810 ck-sources-2.6.7-r2.ebuild 1117
 MD5 ea0b2943958f5f01a64dcdfe7eb2a49b ck-sources-2.6.7-r1.ebuild 1074
 MD5 7b86ae85916ad0cb2f9121c15d847ddb files/digest-ck-sources-2.6.7-r2 129
 MD5 d4a740ae56c2049247083af387a22a85 files/ck-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 8204afea1d572b49a4a80d8da4eef0c9 files/ck-sources-2.6.7.CAN-2004-0596.patch 1033
 MD5 8eef54c4bc3b057938a267b9660ce268 files/digest-ck-sources-2.6.7-r1 129
 MD5 2765d25683c8e7386c378ff57431ef24 files/digest-ck-sources-2.6.7-r5 129
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/ck-sources-2.4.26.FPULockup-53804.patch 354
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.7-r5.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.7-r5.ebuild
index c674b53873cc..6ff23b4e2a19 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.7-r5.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.7-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.7-r5.ebuild,v 1.1 2004/07/09 13:39:01 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.7-r5.ebuild,v 1.2 2004/07/21 10:28:49 plasmaroo Exp $
 
-UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2"
+UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0596.patch"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.7.CAN-2004-0596.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.7.CAN-2004-0596.patch
new file mode 100644
index 000000000000..3e20a2e41372
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-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);