Fix for CAN-0596 (Bug #57826)

5 files changed, 98 insertions, 2 deletions

diff --git a/sys-kernel/pegasos-dev-sources/ChangeLog b/sys-kernel/pegasos-dev-sources/ChangeLog
index c2aa5478cfb4..76ad0371aab8 100644
--- a/sys-kernel/pegasos-dev-sources/ChangeLog
+++ b/sys-kernel/pegasos-dev-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/pegasos-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-dev-sources/ChangeLog,v 1.7 2004/07/21 09:36:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-dev-sources/ChangeLog,v 1.8 2004/07/24 14:24:00 dholm Exp $
+
+*pegasos-dev-sources-2.6.7-r3 (24 Jul 2004)
+
+  24 Jul 2004; David Holm <dholm@gentoo.org>
+  +files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch,
+  +pegasos-dev-sources-2.6.7-r3.ebuild:
+  Fix for CAN-0596 (Bug #57826).
 
 *pegasos-dev-sources-2.6.7-r2 (21 Jul 2004)
 
diff --git a/sys-kernel/pegasos-dev-sources/Manifest b/sys-kernel/pegasos-dev-sources/Manifest
index 1b2fa9af121b..0b511eeba42c 100644
--- a/sys-kernel/pegasos-dev-sources/Manifest
+++ b/sys-kernel/pegasos-dev-sources/Manifest
@@ -1,12 +1,15 @@
 MD5 a7576363e9eaac75a611b02df6490fc7 pegasos-dev-sources-2.6.6.ebuild 1254
 MD5 a768f20366d412feaf748b4ac46b046e metadata.xml 350
-MD5 a50c163272f32c80e7686e4ebc848271 ChangeLog 1407
+MD5 46e2e761417ae9174d5da0a1e2c2c0e9 ChangeLog 1627
 MD5 44f1add417c49441320e5556a3806eb4 pegasos-dev-sources-2.6.6-r1.ebuild 1257
 MD5 68fb4dea1f3006d1b16d7d665f55b120 pegasos-dev-sources-2.6.7.ebuild 1254
 MD5 3f3775b4064584ba1d78b39836e7c53b pegasos-dev-sources-2.6.7-r1.ebuild 1334
 MD5 782c8aba1659976ca1c6213a7ea2c579 pegasos-dev-sources-2.6.7-r2.ebuild 1331
+MD5 712295c7aa370922e2a815590fd6fb5c pegasos-dev-sources-2.6.7-r3.ebuild 1369
 MD5 22015e010d6881a448cfea8cdd5a1f7c files/digest-pegasos-dev-sources-2.6.6 137
 MD5 0362f4716095d6394a832b7cf7d40186 files/digest-pegasos-dev-sources-2.6.6-r1 137
 MD5 e874ef4028d7be81edb23e8b2b5fce6d files/digest-pegasos-dev-sources-2.6.7 137
 MD5 dceafcd9cf083202c2d75b5ddedcec2a files/digest-pegasos-dev-sources-2.6.7-r1 137
 MD5 a45c3d955ae82991742dacf1af789ab5 files/digest-pegasos-dev-sources-2.6.7-r2 137
+MD5 8204afea1d572b49a4a80d8da4eef0c9 files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch 1033
+MD5 a45c3d955ae82991742dacf1af789ab5 files/digest-pegasos-dev-sources-2.6.7-r3 137
diff --git a/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r3 b/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r3
new file mode 100644
index 000000000000..13f0947df084
--- /dev/null
+++ b/sys-kernel/pegasos-dev-sources/files/digest-pegasos-dev-sources-2.6.7-r3
@@ -0,0 +1,2 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 9911ef9569b54ba4b61941fe28569c16 pegpatches-2.6-7.4.tar.bz2 325003
diff --git a/sys-kernel/pegasos-dev-sources/files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch b/sys-kernel/pegasos-dev-sources/files/pegasos-dev-sources-2.6.7.CAN-2004-0596.patch
new file mode 100644
index 000000000000..3e20a2e41372
--- /dev/null
+++ b/sys-kernel/pegasos-dev-sources/files/pegasos-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/pegasos-dev-sources/pegasos-dev-sources-2.6.7-r3.ebuild b/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.7-r3.ebuild
new file mode 100644
index 000000000000..6e5417a0c4f3
--- /dev/null
+++ b/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.7-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-dev-sources/pegasos-dev-sources-2.6.7-r3.ebuild,v 1.1 2004/07/24 14:24:00 dholm Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+# Version of gentoo patchset
+GPV=7.4
+GPV_SRC="mirror://gentoo/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}.tar.bz2"
+
+KEYWORDS="ppc"
+IUSE=""
+
+UNIPATCH_LIST="${DISTDIR}/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}.tar.bz2
+	${FILESDIR}/${P}.CAN-2004-0596.patch"
+UNIPATCH_DOCS="${WORKDIR}/patches/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/0000_README
+	${WORKDIR}/patches/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/pegasos-config"
+
+DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree on Pegasos computers"
+SRC_URI="${KERNEL_URI} ${GPV_SRC}"
+
+DEPEND="${DEPEND} >=dev-libs/ucl-1"
+
+pkg_postinst() {
+	postinst_sources
+
+	ewarn "IMPORTANT:"
+	ewarn "ptyfs support has now been dropped from devfs and as a"
+	ewarn "result you are now required to compile this support into"
+	ewarn "the kernel. You can do so by enabling the following option:"
+	ewarn "    Device Drivers -> Character devices -> Legacy (BSD) PTY Support."
+	echo
+	ewarn "If you choose to use UCL/gcloop please ensure you compile gcloop"
+	ewarn "without -fstack-protector."
+	echo
+}