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

4 files changed, 56 insertions, 2 deletions

diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 04593130fe38..6720065fd27c 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.14 2004/07/17 21:04:34 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.15 2004/07/21 10:36:49 plasmaroo Exp $
+
+*uclinux-sources-2.6.7_p0-r3 (21 Jul 2004)
+
+  21 Jul 2004; <plasmaroo@gentoo.org> -uclinux-sources-2.6.7_p0-r2.ebuild,
+  +uclinux-sources-2.6.7_p0-r3.ebuild,
+  +files/uclinux-sources-2.6.CAN-2004-0596.patch:
+  Version bump for the CAN-2004-0596 issue; bug #57826.
 
 *uclinux-sources-2.6.7_p0-r2 (09 Jul 2004)
 *uclinux-sources-2.4.26_p0-r3 (09 Jul 2004)
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r2 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r3
index a0d14dcb41a9..a0d14dcb41a9 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r2
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r3
diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.CAN-2004-0596.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.CAN-2004-0596.patch
new file mode 100644
index 000000000000..3e20a2e41372
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-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/uclinux-sources/uclinux-sources-2.6.7_p0-r2.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r3.ebuild
index 4441af2d82fe..33acd9c29bb2 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r2.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-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/uclinux-sources/uclinux-sources-2.6.7_p0-r2.ebuild,v 1.1 2004/07/09 16:25:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r3.ebuild,v 1.1 2004/07/21 10:36:49 plasmaroo Exp $
 
 IUSE=""
 
@@ -40,6 +40,7 @@ src_unpack() {
 	cd linux-${KV}
 	epatch ../${MY_P/linux/${base}}.${patch} || die "Failed to apply uClinux patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
+	epatch ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch || die "Failed to apply the CAN-2004-0596 security patch!"
 	epatch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch || die "Failed to apply the IPTables RDoS security patch!"
 	epatch ${FILESDIR}/${PN}-2.6.ProcPerms.patch || die "Failed to apply the /proc permissions security patch!"