fixing net_slip vuln. #74482

Package-Manager: portage-2.0.51.19

6 files changed, 92 insertions, 63 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/Manifest b/sys-kernel/usermode-sources/Manifest
index 84c946f5781c..e8d525acf3e5 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,48 +1,59 @@
-MD5 2d893411f0219dce0dfaa2883d7f961d ChangeLog 17618
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aa34b8764539acfc458342524f7ac787 usermode-sources-2.4.27.ebuild 1647
+MD5 e3113a655f8cf2cd078cbf029be21417 ChangeLog 17866
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 97b5e139d8683825ca63cdcf927a68b4 usermode-sources-2.4.26-r13.ebuild 2415
 MD5 7289c956f9e3681208cce875ef17137a usermode-sources-2.6.8.1-r9.ebuild 1862
-MD5 4b4299f62b65a80161f1acd0a2e4240e files/digest-usermode-sources-2.4.26-r13 300
-MD5 7b6f30de95fee7eef67ec1866a06005a files/digest-usermode-sources-2.6.8.1-r9 214
-MD5 c2510fe1891f5a9effb12c2196922206 files/usermode-sources-2.6.cmdlineLeak.patch 281
-MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
-MD5 b9a94233e1457787352e5f85e3e3582d files/usermode-sources-2.4.binfmt_a.out.patch 2009
-MD5 025c80544aef14ce3a49024d791c5596 files/usermode-sources-2.6.binfmt_a.out.patch 1763
-MD5 530630d25910e6bd9376b63ea099655f files/usermode-sources-2.6.AF_UNIX.patch 469
-MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572
-MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346
-MD5 a37241da52edeb7fb1d4989b28eee9cd files/usermode-sources-2.4.brk-locked.patch 8523
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/usermode-sources-2.6.CAN-2004-1016.patch 2835
-MD5 c942eca63f26d0e933a366491340e95b files/usermode-sources-2.6.CAN-2004-1056.patch 6187
-MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/usermode-sources-2.6.CAN-2004-1137.patch 2551
+MD5 f751a3e304cbed92529ab6783b91e7ba files/digest-usermode-sources-2.4.27 134
+MD5 0cda434273a2558ebcfe696c0e813c78 files/usermode-sources-2.6.78362.patch 2430
+MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809
+MD5 39aeba3172886cd09249af890fecee0e files/usermode-sources-2.6.77666.patch 4735
 MD5 6bcdd0bb63e2db559a5c6465c73a7f89 files/usermode-sources-2.6.CAN-2004-1151.patch 1143
-MD5 c27699e9d62f7d46213bd51f87636163 files/usermode-sources-2.4.vma.patch 8143
-MD5 22192366443458dc8815827df35b63a7 files/usermode-sources-2.6.vma.patch 8034
-MD5 b0a1f80aff51d6601e8924329023b241 files/usermode-sources.AF_UNIX.patch 515
-MD5 1d78b90e495e432432e095ee47bbc2fc files/usermode-sources-2.4.77094.patch 452
-MD5 1efe4024e443e60db5fd9b21b22fabd2 files/usermode-sources-2.4.77666.patch 1724
-MD5 b6cd2468a246169a6e2f969c44e3f341 files/usermode-sources-2.4.78362.patch 10372
-MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/usermode-sources-2.4.78363.patch 788
 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/usermode-sources-2.4.smbfs.patch 3434
-MD5 7695b79187fcc27339ab62af1112ec11 files/usermode-sources-2.6.74070.patch 525
-MD5 655251f31f0bdc85bdd0cd0280af22b7 files/usermode-sources-2.6.75963.patch 979
 MD5 9eda91c0c7c7cd61ac3fbc4b309de3c0 files/usermode-sources-2.6.77094.patch 5193
-MD5 39aeba3172886cd09249af890fecee0e files/usermode-sources-2.6.77666.patch 4735
-MD5 a3f4cfc55b03f9a6104da43da9c38928 files/usermode-sources-2.6.77923.patch 1094
-MD5 0cda434273a2558ebcfe696c0e813c78 files/usermode-sources-2.6.78362.patch 2430
-MD5 eb75782ba6714f1c78b956e1497816f3 files/usermode-sources-2.6.81106.patch 826
-MD5 77a23c26c0468c64ee5bc13c9999d79b files/usermode-sources-2.6.82141.patch 7684
-MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/usermode-sources-2.6.smbfs.patch 3309
+MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348
+MD5 025c80544aef14ce3a49024d791c5596 files/usermode-sources-2.6.binfmt_a.out.patch 1763
+MD5 c942eca63f26d0e933a366491340e95b files/usermode-sources-2.6.CAN-2004-1056.patch 6187
+MD5 757ee1239c3f14645ccea3640d551e11 files/usermode-sources-2.4.CAN-2004-1056.patch 11249
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
+MD5 b0a1f80aff51d6601e8924329023b241 files/usermode-sources.AF_UNIX.patch 515
+MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346
 MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499
-MD5 4d656fa3f3a47df751c0d78b64ed8353 files/usermode-sources-2.6.AF_UNIX.SELinux.patch 1761
-MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
-MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348
-MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
+MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572
+MD5 22192366443458dc8815827df35b63a7 files/usermode-sources-2.6.vma.patch 8034
 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
-MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/usermode-sources-2.4.CAN-2004-1016.patch 2835
-MD5 757ee1239c3f14645ccea3640d551e11 files/usermode-sources-2.4.CAN-2004-1056.patch 11249
-MD5 8c35751caf824a9dacb02e80d6189b2e files/usermode-sources-2.4.CAN-2004-1137.patch 1764
+MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
+MD5 b6cd2468a246169a6e2f969c44e3f341 files/usermode-sources-2.4.78362.patch 10372
+MD5 7b6f30de95fee7eef67ec1866a06005a files/digest-usermode-sources-2.6.8.1-r9 214
+MD5 1efe4024e443e60db5fd9b21b22fabd2 files/usermode-sources-2.4.77666.patch 1724
+MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/usermode-sources-2.6.smbfs.patch 3309
+MD5 4d656fa3f3a47df751c0d78b64ed8353 files/usermode-sources-2.6.AF_UNIX.SELinux.patch 1761
+MD5 7695b79187fcc27339ab62af1112ec11 files/usermode-sources-2.6.74070.patch 525
+MD5 1d78b90e495e432432e095ee47bbc2fc files/usermode-sources-2.4.77094.patch 452
+MD5 b46a34c10b4df53c66711f87f039c305 files/usermode-sources-2.4.27.CAN-2004-1295.patch 721
+MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/usermode-sources-2.4.78363.patch 788
 MD5 cd0a7533c43364e377348613c6d76bb7 files/usermode-sources-2.6.brk-locked.patch 9736
+MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/usermode-sources-2.6.CAN-2004-1137.patch 2551
+MD5 8c35751caf824a9dacb02e80d6189b2e files/usermode-sources-2.4.CAN-2004-1137.patch 1764
+MD5 77a23c26c0468c64ee5bc13c9999d79b files/usermode-sources-2.6.82141.patch 7684
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/usermode-sources-2.6.CAN-2004-1016.patch 2835
+MD5 655251f31f0bdc85bdd0cd0280af22b7 files/usermode-sources-2.6.75963.patch 979
+MD5 c2510fe1891f5a9effb12c2196922206 files/usermode-sources-2.6.cmdlineLeak.patch 281
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/usermode-sources-2.4.CAN-2004-1016.patch 2835
+MD5 530630d25910e6bd9376b63ea099655f files/usermode-sources-2.6.AF_UNIX.patch 469
+MD5 eb75782ba6714f1c78b956e1497816f3 files/usermode-sources-2.6.81106.patch 826
+MD5 b9a94233e1457787352e5f85e3e3582d files/usermode-sources-2.4.binfmt_a.out.patch 2009
+MD5 a37241da52edeb7fb1d4989b28eee9cd files/usermode-sources-2.4.brk-locked.patch 8523
+MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
+MD5 a3f4cfc55b03f9a6104da43da9c38928 files/usermode-sources-2.6.77923.patch 1094
+MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
+MD5 c27699e9d62f7d46213bd51f87636163 files/usermode-sources-2.4.vma.patch 8143
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCXTaFz7mlh8wQzGMRAuOPAKCQcifXvSf/KAiCF5hSdrdBf6bTCACbB6VC
+D/ka1YnNS9M/e0+D+ACzeCY=
+=wsmZ
+-----END PGP SIGNATURE-----
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