fixing net_slip vuln. #74482

(Portage version: 2.0.51.19)

5 files changed, 43 insertions, 25 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index a90ef8e91032..a45de25b80c0 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.63 2005/03/17 00:36:35 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.64 2005/04/13 15:10:37 johnm Exp $
+
+*usermode-sources-2.4.27 (13 Apr 2005)
+
+  13 Apr 2005; John Mylchreest <johnm@gentoo.org>
+  +files/usermode-sources-2.4.27.CAN-2004-1295.patch,
+  -usermode-sources-2.4.26-r13.ebuild, +usermode-sources-2.4.27.ebuild:
+  fixing net_slip vuln. #74482
 
   17 Mar 2005; <r3pek@gentoo.org> usermode-sources-2.4.26-r13.ebuild,
   usermode-sources-2.6.8.1-r9.ebuild:
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r13 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r13
deleted file mode 100644
index c93c1df63191..000000000000
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r13
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 3fb146ded9e33819b815f5d233b891c2 uml-patch-2.4.26-3.bz2 206477
-MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
-MD5 7713e01c5bcecd8ef998b15651eb3931 usermode-sources-2.4.26-CAN-2004-0814.2.patch 147663
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.27 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.27
new file mode 100644
index 000000000000..776bed92577e
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.27
@@ -0,0 +1,2 @@
+MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
+MD5 63178bbd3a383a1005738f4628ff583e uml-patch-2.4.27-1.bz2 206975
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.4.27.CAN-2004-1295.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.4.27.CAN-2004-1295.patch
new file mode 100644
index 000000000000..816bebdf9c8b
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.4.27.CAN-2004-1295.patch
@@ -0,0 +1,29 @@
+--- linux-2.4.27-1um.old/arch/um/drivers/slip_user.c	2005-03-07 09:59:14.000000000 -0500
++++ linux-2.4.27-1um.new/arch/um/drivers/slip_user.c	2005-03-07 11:55:25.000000000 -0500
+@@ -108,6 +108,9 @@
+ 			err = -EINVAL;
+ 		}
+ 	}
++
++	os_close_file(fds[0]);
++
+ 	return(err);
+ }
+ 
+@@ -128,6 +131,7 @@
+ 	sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
+ 	if(sfd < 0){
+ 		printk("Couldn't open tty for slip line, err = %d\n", -sfd);
++		os_close_file(mfd);
+ 		return(sfd);
+ 	}
+ 	if(set_up_tty(sfd)) return(-1);
+@@ -175,7 +179,7 @@
+ 
+ 	sprintf(version_buf, "%d", UML_NET_VERSION);
+ 
+-	err = slip_tramp(argv, -1);
++	err = slip_tramp(argv, pri->slave);
+ 
+ 	if(err != 0)
+ 		printk("slip_tramp failed - errno = %d\n", -err);
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r13.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.27.ebuild
index 1ed0164a4f2a..beb6c06da986 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r13.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4.26-r13.ebuild,v 1.3 2005/03/17 00:36:35 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.27.ebuild,v 1.1 2005/04/13 15:10:37 johnm Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -9,33 +9,17 @@ detect_version
 EXTRAVERSION="${EXTRAVERSION/usermode/uml1}"
 KV_FULL="${KV_FULL/usermode/uml1}"
 
-UML_PATCH="uml-patch-${PV}-3"
+UML_PATCH="uml-patch-${OKV}-1"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0415.patch
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.2.patch"
+SRC_URI="${KERNEL_URI} mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc"
-IUSE=""
 RESTRICT="nomirror"
 
-# console-tools is needed to solve the loadkeys fiasco.
-# binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-DEPEND="${DEPEND} >=sys-devel/binutils-2.11.90.0.31 dev-lang/perl"
-RDEPEND="${RDEPEND} >=sys-libs/ncurses-5.2"
-
 UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
-	${FILESDIR}/${P}.CAN-2004-0394.patch
-	${DISTDIR}/linux-${PV}-CAN-2004-0415.patch
-	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
-	${FILESDIR}/${PN}.CAN-2004-0497.patch
-	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
-	${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch
-	${DISTDIR}/${P}-CAN-2004-0814.2.patch
-	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
+	${FILESDIR}/${P}.CAN-2004-1295.patch
 	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
 	${FILESDIR}/${PN}-2.4.XDRWrapFix.patch
 	${FILESDIR}/${PN}-2.4.binfmt_elf.patch