-m 2.6.11-bs4 release

(Portage version: 1.589-cvs)

11 files changed, 366 insertions, 12 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index a45de25b80c0..ea38101f34a0 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,18 @@
 # 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.64 2005/04/13 15:10:37 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.65 2005/04/30 00:37:43 dsd Exp $
+
+*usermode-sources-2.6.11 (30 Apr 2005)
+
+  30 Apr 2005; Daniel Drake <dsd@gentoo.org>
+  +files/usermode-sources-2.6.CAN-2005-0400.patch,
+  +files/usermode-sources-2.6.CAN-2005-0749.patch,
+  +files/usermode-sources-2.6.CAN-2005-0384.patch,
+  +files/usermode-sources-2.6.CAN-2005-0736.patch,
+  +files/usermode-sources-2.6.CAN-2005-0750.patch,
+  +files/usermode-sources-2.6.CAN-2005-0815.patch,
+  +files/usermode-sources-2.6.rose.patch, +usermode-sources-2.6.11.ebuild:
+  -m 2.6.11-bs4 release
 
 *usermode-sources-2.4.27 (13 Apr 2005)
 
@@ -16,6 +28,10 @@
   16 Mar 2005; <plasmaroo@gentoo.org> files/usermode-sources-2.6.77666.patch:
   Fix 2.6 #77666 patch.
 
+  16 Mar 2005; Daniel Drake <dsd@gentoo.org>
+  files/usermode-sources-2.6.77666.patch:
+  Fix 77666 patch to compile
+
   07 Mar 2005; <plasmaroo@gentoo.org> usermode-sources-2.6.8.1-r9.ebuild,
   +files/usermode-sources-2.6.78362.patch:
   Add #7836[23] for 2.6.
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index e8d525acf3e5..8cd1bdcf8fa5 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,22 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 a204884046187e66482fee6abe957504 usermode-sources-2.6.11.ebuild 1230
 MD5 aa34b8764539acfc458342524f7ac787 usermode-sources-2.4.27.ebuild 1647
-MD5 e3113a655f8cf2cd078cbf029be21417 ChangeLog 17866
+MD5 cf27968a5365dec8a4d7af3645ec506d ChangeLog 17983
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
 MD5 7289c956f9e3681208cce875ef17137a usermode-sources-2.6.8.1-r9.ebuild 1862
 MD5 f751a3e304cbed92529ab6783b91e7ba files/digest-usermode-sources-2.4.27 134
+MD5 751085b47b298722f8b09ef7714946b9 files/digest-usermode-sources-2.6.11 135
 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 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/usermode-sources-2.4.smbfs.patch 3434
+MD5 2ec000e8ab9208c9920d10bcad3a68a4 files/usermode-sources-2.6.CAN-2005-0815.patch 1500
 MD5 9eda91c0c7c7cd61ac3fbc4b309de3c0 files/usermode-sources-2.6.77094.patch 5193
 MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348
 MD5 025c80544aef14ce3a49024d791c5596 files/usermode-sources-2.6.binfmt_a.out.patch 1763
+MD5 20f5d88d904af17f32fcd85ceb2f818a files/usermode-sources-2.6.CAN-2005-0750.patch 719
 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 7e31f0c8aaee84b6ddf9e7adc94d15e2 files/usermode-sources-2.6.rose.patch 1054
+MD5 b54517954dbd8158aaa1cf2f776d9c96 files/usermode-sources-2.6.CAN-2005-0384.patch 1249
 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
@@ -24,6 +27,7 @@ MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch
 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 f592684da7128847ad4b54e078b7dd13 files/usermode-sources-2.6.CAN-2005-0400.patch 1070
 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
@@ -43,17 +47,12 @@ 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 c2875bf7050af7853841623e4b73d6f7 files/usermode-sources-2.6.CAN-2005-0736.patch 1001
 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 099bf49709dba4d677deae69f9032f2d files/usermode-sources-2.6.CAN-2005-0749.patch 2911
 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.6.11 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.11
new file mode 100644
index 000000000000..29aa3c7c16c3
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.11
@@ -0,0 +1,2 @@
+MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
+MD5 940a7ec8012d361467b57177275a53a4 uml-2.6.11-bs4.patch.bz2 23530
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0384.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0384.patch
new file mode 100644
index 000000000000..1c7ac0efb5a9
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0384.patch
@@ -0,0 +1,36 @@
+diff -Naru a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
+--- a/drivers/net/ppp_async.c	2005-04-29 17:05:10 -07:00
++++ b/drivers/net/ppp_async.c	2005-04-29 17:05:10 -07:00
+@@ -1000,7 +1000,7 @@
+ 	data += 4;
+ 	dlen -= 4;
+ 	/* data[0] is code, data[1] is length */
+-	while (dlen >= 2 && dlen >= data[1]) {
++	while (dlen >= 2 && dlen >= data[1] && data[1] >= 2) {
+ 		switch (data[0]) {
+ 		case LCP_MRU:
+ 			val = (data[2] << 8) + data[3];
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/15 15:38:47-08:00 paulus@au1.ibm.com 
+#   [PATCH] CAN-2005-0384: Remote Linux DoS on ppp servers
+#   
+#   Martin Schulze writes:
+#   
+#   > Ben Martel and Stephen Blackheath have discovered a denial-of-service attack
+#   > that a client of pppd can make that can hang the server machine.  The bug is
+#   > in the Linux kernel 2.6 (tested on 2.6.9), but it looks like it also exists
+#   > in the 2.4 series.
+#   
+#   Yes, this is my bug. :(
+#   
+#   I would just do this instead:
+#   
+#   Signed-off-by: Chris Wright <chrisw@osdl.org>
+#   Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+# 
+# drivers/net/ppp_async.c
+#   2005/02/24 15:38:05-08:00 paulus@au1.ibm.com +1 -1
+#   CAN-2005-0384: Remote Linux DoS on ppp servers
+# 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0400.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0400.patch
new file mode 100644
index 000000000000..f7a572fefc81
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0400.patch
@@ -0,0 +1,33 @@
+diff -Naru a/fs/ext2/dir.c b/fs/ext2/dir.c
+--- a/fs/ext2/dir.c	2005-04-29 17:11:20 -07:00
++++ b/fs/ext2/dir.c	2005-04-29 17:11:20 -07:00
+@@ -592,6 +592,7 @@
+ 		goto fail;
+ 	}
+ 	kaddr = kmap_atomic(page, KM_USER0);
++       memset(kaddr, 0, chunk_size);
+ 	de = (struct ext2_dir_entry_2 *)kaddr;
+ 	de->name_len = 1;
+ 	de->rec_len = cpu_to_le16(EXT2_DIR_REC_LEN(1));
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/25 17:50:01-08:00 mlafon@arkoon.net 
+#   [PATCH] Suspected information leak (mem pages) in ext2
+#   
+#   From: "Mathieu Lafon" <mlafon@arkoon.net>
+#   
+#   I think I have discovered a potential security problem in ext2: when a
+#   new directory is created, the ext2 block written to disk is not
+#   initialized.
+#   
+#   Included is a proposed patch for Linux 2.6 (ext2_make_empty() function):
+#   
+#   CAN-2005-0400 is assigned to this issue.
+#   
+#   Signed-off-by: Chris Wright <chrisw@osdl.org>
+# 
+# fs/ext2/dir.c
+#   2005/03/16 10:17:01-08:00 mlafon@arkoon.net +1 -0
+#   Suspected information leak (mem pages) in ext2
+# 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0736.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0736.patch
new file mode 100644
index 000000000000..ecf4ccddb98a
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0736.patch
@@ -0,0 +1,34 @@
+diff -Naru a/fs/eventpoll.c b/fs/eventpoll.c
+--- a/fs/eventpoll.c	2005-04-29 17:08:35 -07:00
++++ b/fs/eventpoll.c	2005-04-29 17:08:35 -07:00
+@@ -619,6 +619,7 @@
+ 	return error;
+ }
+ 
++#define MAX_EVENTS (INT_MAX / sizeof(struct epoll_event))
+ 
+ /*
+  * Implement the event wait interface for the eventpoll file. It is the kernel
+@@ -635,7 +636,7 @@
+ 		     current, epfd, events, maxevents, timeout));
+ 
+ 	/* The maximum number of event must be greater than zero */
+-	if (maxevents <= 0)
++	if (maxevents <= 0 || maxevents > MAX_EVENTS)
+ 		return -EINVAL;
+ 
+ 	/* Verify that the area passed by the user is writeable */
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/08 08:18:50-08:00 torvalds@ppc970.osdl.org 
+#   epoll: return proper error on overflow condition
+#   
+#   Noted by Georgi Guninski.
+# 
+# fs/eventpoll.c
+#   2005/03/08 08:18:40-08:00 torvalds@ppc970.osdl.org +2 -1
+#   epoll: return proper error on overflow condition
+#   
+#   Noted by Georgi Guninski.
+# 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0749.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0749.patch
new file mode 100644
index 000000000000..46beac7587df
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0749.patch
@@ -0,0 +1,92 @@
+diff -Naru a/fs/binfmt_elf.c b/fs/binfmt_elf.c
+--- a/fs/binfmt_elf.c	2005-04-29 17:13:50 -07:00
++++ b/fs/binfmt_elf.c	2005-04-29 17:13:50 -07:00
+@@ -1008,6 +1008,7 @@
+ static int load_elf_library(struct file *file)
+ {
+ 	struct elf_phdr *elf_phdata;
++	struct elf_phdr *eppnt;
+ 	unsigned long elf_bss, bss, len;
+ 	int retval, error, i, j;
+ 	struct elfhdr elf_ex;
+@@ -1031,44 +1032,47 @@
+ 	/* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */
+ 
+ 	error = -ENOMEM;
+-	elf_phdata = (struct elf_phdr *) kmalloc(j, GFP_KERNEL);
++	elf_phdata = kmalloc(j, GFP_KERNEL);
+ 	if (!elf_phdata)
+ 		goto out;
+ 
++	eppnt = elf_phdata;
+ 	error = -ENOEXEC;
+-	retval = kernel_read(file, elf_ex.e_phoff, (char *) elf_phdata, j);
++	retval = kernel_read(file, elf_ex.e_phoff, (char *)eppnt, j);
+ 	if (retval != j)
+ 		goto out_free_ph;
+ 
+ 	for (j = 0, i = 0; i<elf_ex.e_phnum; i++)
+-		if ((elf_phdata + i)->p_type == PT_LOAD) j++;
++		if ((eppnt + i)->p_type == PT_LOAD)
++			j++;
+ 	if (j != 1)
+ 		goto out_free_ph;
+ 
+-	while (elf_phdata->p_type != PT_LOAD) elf_phdata++;
++	while (eppnt->p_type != PT_LOAD)
++		eppnt++;
+ 
+ 	/* Now use mmap to map the library into memory. */
+ 	down_write(&current->mm->mmap_sem);
+ 	error = do_mmap(file,
+-			ELF_PAGESTART(elf_phdata->p_vaddr),
+-			(elf_phdata->p_filesz +
+-			 ELF_PAGEOFFSET(elf_phdata->p_vaddr)),
++			ELF_PAGESTART(eppnt->p_vaddr),
++			(eppnt->p_filesz +
++			 ELF_PAGEOFFSET(eppnt->p_vaddr)),
+ 			PROT_READ | PROT_WRITE | PROT_EXEC,
+ 			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
+-			(elf_phdata->p_offset -
+-			 ELF_PAGEOFFSET(elf_phdata->p_vaddr)));
++			(eppnt->p_offset -
++			 ELF_PAGEOFFSET(eppnt->p_vaddr)));
+ 	up_write(&current->mm->mmap_sem);
+-	if (error != ELF_PAGESTART(elf_phdata->p_vaddr))
++	if (error != ELF_PAGESTART(eppnt->p_vaddr))
+ 		goto out_free_ph;
+ 
+-	elf_bss = elf_phdata->p_vaddr + elf_phdata->p_filesz;
++	elf_bss = eppnt->p_vaddr + eppnt->p_filesz;
+ 	if (padzero(elf_bss)) {
+ 		error = -EFAULT;
+ 		goto out_free_ph;
+ 	}
+ 
+-	len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
+-	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
++	len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + ELF_MIN_ALIGN - 1);
++	bss = eppnt->p_memsz + eppnt->p_vaddr;
+ 	if (bss > len) {
+ 		down_write(&current->mm->mmap_sem);
+ 		do_brk(len, bss - len);
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/25 17:50:52-08:00 akpm@osdl.org 
+#   [PATCH] Potential DOS in load_elf_library
+#   
+#   From: Herbert Xu <herbert@gondor.apana.org.au>
+#   
+#   Yichen Xie <yxie@cs.stanford.edu> points out that load_elf_library can
+#   modify `elf_phdata' before freeing it.
+#   
+#   CAN-2005-0749 is assigned to this issue.
+#   
+#   Signed-off-by: Andrew Morton <akpm@osdl.org>
+#   Signed-off-by: Chris Wright <chrisw@osdl.org>
+# 
+# fs/binfmt_elf.c
+#   2005/03/20 16:56:41-08:00 akpm@osdl.org +17 -13
+#   Potential DOS in load_elf_library
+# 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0750.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0750.patch
new file mode 100644
index 000000000000..7d3e37d91167
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0750.patch
@@ -0,0 +1,30 @@
+===== net/bluetooth/af_bluetooth.c 1.40 vs edited =====
+--- 1.40/net/bluetooth/af_bluetooth.c	2005-03-18 15:07:22 +01:00
++++ edited/net/bluetooth/af_bluetooth.c	2005-03-24 19:42:16 +01:00
+@@ -62,7 +62,7 @@
+ 
+ int bt_sock_register(int proto, struct net_proto_family *ops)
+ {
+-	if (proto >= BT_MAX_PROTO)
++	if (proto < 0 || proto >= BT_MAX_PROTO)
+ 		return -EINVAL;
+ 
+ 	if (bt_proto[proto])
+@@ -75,7 +75,7 @@
+ 
+ int bt_sock_unregister(int proto)
+ {
+-	if (proto >= BT_MAX_PROTO)
++	if (proto < 0 || proto >= BT_MAX_PROTO)
+ 		return -EINVAL;
+ 
+ 	if (!bt_proto[proto])
+@@ -90,7 +90,7 @@
+ {
+ 	int err = 0;
+ 
+-	if (proto >= BT_MAX_PROTO)
++	if (proto < 0 || proto >= BT_MAX_PROTO)
+ 		return -EINVAL;
+ 
+ #if defined(CONFIG_KMOD)
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0815.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0815.patch
new file mode 100644
index 000000000000..d3307e63de48
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.CAN-2005-0815.patch
@@ -0,0 +1,47 @@
+diff -Naru a/fs/isofs/inode.c b/fs/isofs/inode.c
+--- a/fs/isofs/inode.c	2005-04-29 17:15:48 -07:00
++++ b/fs/isofs/inode.c	2005-04-29 17:15:48 -07:00
+@@ -685,6 +685,8 @@
+ 	  sbi->s_log_zone_size = isonum_723 (h_pri->logical_block_size);
+ 	  sbi->s_max_size = isonum_733(h_pri->volume_space_size);
+ 	} else {
++	  if (!pri)
++	    goto out_freebh;
+ 	  rootp = (struct iso_directory_record *) pri->root_directory_record;
+ 	  sbi->s_nzones = isonum_733 (pri->volume_space_size);
+ 	  sbi->s_log_zone_size = isonum_723 (pri->logical_block_size);
+@@ -1394,6 +1396,9 @@
+ 	unsigned long hashval;
+ 	struct inode *inode;
+ 	struct isofs_iget5_callback_data data;
++
++	if (offset >= 1ul << sb->s_blocksize_bits)
++		return NULL;
+ 
+ 	data.block = block;
+ 	data.offset = offset;
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/25 17:45:24-08:00 torvalds@osdl.org 
+#   [PATCH] isofs: more "corrupted iso image" error cases
+#   
+#   Michal Zalewski <lcamtuf@dione.ids.pl> discovers range checking flaws in
+#   iso9660 filesystem.
+#   
+#   http://marc.theaimsgroup.com/?l=bugtraq&m=111110067304783&w=2
+#   
+#   CAN-2005-0815 is assigned to this issue.
+#   
+#   From: Linus Torvalds <torvalds@osdl.org>
+#   
+#   isofs: more "corrupted iso image" error cases
+#   
+#   Thanks to Michal Zalewski for testing.
+#   
+#   Signed-off-by: Chris Wright <chrisw@osdl.org>
+# 
+# fs/isofs/inode.c
+#   2005/03/25 15:26:02-08:00 torvalds@osdl.org +5 -0
+#   isofs: more "corrupted iso image" error cases
+# 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.rose.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.rose.patch
new file mode 100644
index 000000000000..8592dfd51c4e
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.rose.patch
@@ -0,0 +1,33 @@
+diff -Naru a/net/rose/rose_route.c b/net/rose/rose_route.c
+--- a/net/rose/rose_route.c	2005-04-29 17:09:49 -07:00
++++ b/net/rose/rose_route.c	2005-04-29 17:09:49 -07:00
+@@ -727,7 +727,8 @@
+ 		}
+ 		if (rose_route.mask > 10) /* Mask can't be more than 10 digits */
+ 			return -EINVAL;
+-
++		if (rose_route.ndigis > 8) /* No more than 8 digipeats */
++			return -EINVAL;
+ 		err = rose_add_node(&rose_route, dev);
+ 		dev_put(dev);
+ 		return err;
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/10 19:47:08-08:00 ralf@linux-mips.org 
+#   [ROSE]: Fix minor security hole
+#   
+#   ROSE wasn't verifying the ndigis argument of a new route resulting in a
+#   minor security hole.
+#   
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+# 
+# net/rose/rose_route.c
+#   2005/03/10 19:46:52-08:00 ralf@linux-mips.org +2 -1
+#   [ROSE]: Fix minor security hole
+#   
+#   ROSE wasn't verifying the ndigis argument of a new route resulting in a
+#   minor security hole.
+#   
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+# 
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.11.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.11.ebuild
new file mode 100644
index 000000000000..5b2a4c07cc29
--- /dev/null
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.11.ebuild
@@ -0,0 +1,32 @@
+# 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.6.11.ebuild,v 1.1 2005/04/30 00:37:43 dsd Exp $
+
+#K_NOUSENAME="yes"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+UML_VER="uml-${OKV}-bs4"
+
+UNIPATCH_LIST="${DISTDIR}/${UML_VER}.patch.bz2
+	${FILESDIR}/${PN}-2.6.74070.patch
+	${FILESDIR}/${PN}-2.6.CAN-2005-0384.patch
+	${FILESDIR}/${PN}-2.6.CAN-2005-0736.patch
+	${FILESDIR}/${PN}-2.6.CAN-2005-0400.patch
+	${FILESDIR}/${PN}-2.6.CAN-2005-0750.patch
+	${FILESDIR}/${PN}-2.6.CAN-2005-0749.patch
+	${FILESDIR}/${PN}-2.6.CAN-2005-0815.patch
+	${FILESDIR}/${PN}-2.6.rose.patch"
+
+DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
+	http://www.user-mode-linux.org/~blaisorblade/patches/guest/${UML_VER}/${UML_VER}.patch.bz2"
+HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
+KEYWORDS="~x86"
+IUSE=""
+
+K_EXTRAEINFO="Since you are using UML, you may want to read the Gentoo Linux
+Developer's guide to system testing with User-Mode Linux that
+can be fount at http://www.gentoo.org/doc/en/uml.xml"
+