Version bump for the CAN-2004-0596 issue; bug #57826.

4 files changed, 56 insertions, 2 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 8106dfddf1c7..37d478d42209 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.29 2004/07/17 21:08:42 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.30 2004/07/21 10:46:14 plasmaroo Exp $
+
+*win4lin-sources-2.6.7-r3 (21 Jul 2004)
+
+  21 Jul 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.6.7-r2.ebuild,
+  +win4lin-sources-2.6.7-r3.ebuild,
+  +files/win4lin-sources-2.6.CAN-2004-0596.patch:
+  Version bump for the CAN-2004-0596 issue; bug #57826.
 
 *win4lin-sources-2.4.26-r3 (09 Jul 2004)
 *win4lin-sources-2.6.7-r2 (09 Jul 2004)
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r2 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r3
index e3ba3bbce50d..e3ba3bbce50d 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r2
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r3
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2004-0596.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2004-0596.patch
new file mode 100644
index 000000000000..3e20a2e41372
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.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/win4lin-sources/win4lin-sources-2.6.7-r2.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r3.ebuild
index 9984ef55ceb5..c5837f72e23f 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r2.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r2.ebuild,v 1.1 2004/07/09 17:45:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r3.ebuild,v 1.1 2004/07/21 10:46:14 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -11,6 +11,7 @@ UNIPATCH_LIST="
 	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch
 	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
 	${FILESDIR}/${PN}.CAN-2004-0497.patch
+	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
 	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
 	${FILESDIR}/${PN}-2.6.ProcPerms.patch"