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

5 files changed, 70 insertions, 16 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 2ec31c2d1152..3d6d4adbb38b 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.41 2004/07/17 21:06:40 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.42 2004/07/21 11:20:04 plasmaroo Exp $
+
+*usermode-sources-2.6.6-r4 (21 Jul 2004)
+
+  21 Jul 2004; <plasmaroo@gentoo.org> -usermode-sources-2.6.6-r3.ebuild,
+  +usermode-sources-2.6.6-r4.ebuild,
+  +files/usermode-sources-2.6.CAN-2004-0596.patch:
+  Version bump for the CAN-2004-0596 issue; bug #57826.
 
 *usermode-sources-2.6.6-r3 (09 Jul 2004)
 *usermode-sources-2.4.24-r6 (09 Jul 2004)
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index fd072985e278..cacd87d7a858 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,24 +1,25 @@
+MD5 83bb026c0e05a1b07e90452df879860f ChangeLog 10435
 MD5 f02cf5f0a00762d227f7c913b0a41a5a usermode-sources-2.4.26-r3.ebuild 1958
 MD5 ec937ee516ab651055687bcaa75a67eb usermode-sources-2.4.24-r6.ebuild 2699
-MD5 8ad822e69ce754e033c66edcbe898252 ChangeLog 10175
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 69290e33a53dee51edf184c93435f113 usermode-sources-2.6.6-r3.ebuild 955
+MD5 45aae191f37fe581649581959f21033a usermode-sources-2.6.6-r4.ebuild 997
+MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
+MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
+MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r6 134
+MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r4 132
 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/usermode-sources-2.6.6.FPULockup-53804.patch 895
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/usermode-sources-2.4.24.CAN-2004-0427.patch 460
-MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r6 134
+MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
+MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
 MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r3 134
+MD5 8204afea1d572b49a4a80d8da4eef0c9 files/usermode-sources-2.6.CAN-2004-0596.patch 1033
 MD5 de75cfa969ed092578d9ddda6c5be334 files/usermode-sources-2.4.24.CAN-2004-0181.patch 1233
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
-MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
-MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r3 132
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
 MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 39361f8d16b1fe5891aab62e92f8cd30 files/usermode-sources-2.6.IPTables-RDoS.patch 390
+MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
 MD5 b738cb0120a32aa92cfcfdbd564dd21f files/usermode-sources-2.6.6.ProcPerms.patch 1368
+MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
-MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
-MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
 MD5 21f3a4f186017d925067335e24db36a1 files/usermode-sources-2.4.24.CAN-2004-0109.patch 1877
-MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
-MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
-MD5 39361f8d16b1fe5891aab62e92f8cd30 files/usermode-sources-2.6.IPTables-RDoS.patch 390
-MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r3 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r4
index 97a9c9ea6e86..97a9c9ea6e86 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r3
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r4
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2004-0596.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2004-0596.patch
new file mode 100644
index 000000000000..3e20a2e41372
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-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/usermode-sources/usermode-sources-2.6.6-r3.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r4.ebuild
index e3b0cc789ad1..c32c2d01737e 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r3.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r4.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/usermode-sources/usermode-sources-2.6.6-r3.ebuild,v 1.1 2004/07/09 17:29:11 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r4.ebuild,v 1.1 2004/07/21 11:20:04 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -13,7 +13,7 @@ KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 IUSE=""
 
-UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${PN}.CAN-2004-0497.patch ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch ${FILESDIR}/${P}.ProcPerms.patch"
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${PN}.CAN-2004-0497.patch ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch ${FILESDIR}/${P}.ProcPerms.patch ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2