Add #7836[23] for 2.6.

Package-Manager: portage-2.0.51.19

4 files changed, 84 insertions, 4 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 6d8113df6474..fc0f21c14d2c 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,10 @@
 # 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.60 2005/03/07 23:10:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.61 2005/03/07 23:17:35 plasmaroo Exp $
+
+  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.
 
 *usermode-sources-2.6.8.1-r9 (07 Mar 2005)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index ac624238fb5d..2668e87a4576 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,5 +1,5 @@
-MD5 ba2f602fb122e73b37bb56f9952a67e7 ChangeLog 17224
-MD5 49321cf687984c80bbcc63446dd96d8f usermode-sources-2.6.8.1-r9.ebuild 1602
+MD5 6ee1b3dfe6accdbeb51e47de0c651b55 ChangeLog 17367
+MD5 d8a22cdd09d93f364532aa9db4847e09 usermode-sources-2.6.8.1-r9.ebuild 1672
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
 MD5 9e804b166cae43cb25c2726a07a5d744 usermode-sources-2.4.26-r13.ebuild 2246
 MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
@@ -38,6 +38,7 @@ MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 57
 MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499
 MD5 7b6f30de95fee7eef67ec1866a06005a files/digest-usermode-sources-2.6.8.1-r9 214
 MD5 9eda91c0c7c7cd61ac3fbc4b309de3c0 files/usermode-sources-2.6.77094.patch 5193
+MD5 0cda434273a2558ebcfe696c0e813c78 files/usermode-sources-2.6.78362.patch 2430
 MD5 c27699e9d62f7d46213bd51f87636163 files/usermode-sources-2.4.vma.patch 8143
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 a3f4cfc55b03f9a6104da43da9c38928 files/usermode-sources-2.6.77923.patch 1094
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.78362.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.78362.patch
new file mode 100644
index 000000000000..77d32c3cc035
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.78362.patch
@@ -0,0 +1,73 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/12/08 13:03:03-08:00 davem@nuts.davemloft.net 
+#   [NET]: CMSG compat code needs signedness fixes too.
+#   
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+# 
+# net/compat.c
+#   2004/12/08 13:02:32-08:00 davem@nuts.davemloft.net +7 -5
+#   [NET]: CMSG compat code needs signedness fixes too.
+# 
+# ChangeSet
+#   2004/12/10 09:52:42-08:00 torvalds@ppc970.osdl.org 
+#   Make sure VC resizing fits in s16.
+#   
+#   Noted by Georgi Guninski
+# 
+# drivers/char/vt.c
+#   2004/12/10 09:52:35-08:00 torvalds@ppc970.osdl.org +5 -0
+#   Make sure VC resizing fits in s16.
+# 
+diff -Nru a/net/compat.c b/net/compat.c
+--- a/net/compat.c	2005-02-15 11:46:30 -08:00
++++ b/net/compat.c	2005-02-15 11:46:30 -08:00
+@@ -124,6 +124,12 @@
+ 	 (struct compat_cmsghdr __user *)((msg)->msg_control) :		\
+ 	 (struct compat_cmsghdr __user *)NULL)
+ 
++#define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
++	((ucmlen) >= sizeof(struct cmsghdr) && \
++	 (ucmlen) <= (unsigned long) \
++	 ((mhdr)->msg_controllen - \
++	  ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
++
+ static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
+ 		struct compat_cmsghdr __user *cmsg, int cmsg_len)
+ {
+@@ -154,11 +160,7 @@
+ 			return -EFAULT;
+ 
+ 		/* Catch bogons. */
+-		if(CMSG_COMPAT_ALIGN(ucmlen) <
+-		   CMSG_COMPAT_ALIGN(sizeof(struct compat_cmsghdr)))
+-			return -EINVAL;
+-		if((unsigned long)(((char __user *)ucmsg - (char __user *)kmsg->msg_control)
+-				   + ucmlen) > kmsg->msg_controllen)
++		if (!CMSG_COMPAT_OK(ucmlen, ucmsg, kmsg))
+ 			return -EINVAL;
+ 
+ 		tmp = ((ucmlen - CMSG_COMPAT_ALIGN(sizeof(*ucmsg))) +
+diff -Nru a/drivers/char/vt.c b/drivers/char/vt.c
+--- a/drivers/char/vt.c	2005-02-15 11:46:59 -08:00
++++ b/drivers/char/vt.c	2005-02-15 11:46:59 -08:00
+@@ -768,6 +768,8 @@
+  * [this is to be used together with some user program
+  * like resize that changes the hardware videomode]
+  */
++#define VC_RESIZE_MAXCOL (32767)
++#define VC_RESIZE_MAXROW (32767)
+ int vc_resize(int currcons, unsigned int cols, unsigned int lines)
+ {
+ 	unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
+@@ -779,6 +781,9 @@
+ 
+ 	if (!vc_cons_allocated(currcons))
+ 		return -ENXIO;
++
++	if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW)
++		return -EINVAL;
+ 
+ 	new_cols = (cols ? cols : video_num_columns);
+ 	new_rows = (lines ? lines : video_num_lines);
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r9.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r9.ebuild
index ca80210604da..66793b7b5610 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r9.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r9.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.6.8.1-r9.ebuild,v 1.1 2005/03/07 23:10:16 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r9.ebuild,v 1.2 2005/03/07 23:17:35 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -29,6 +29,8 @@ UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
 	${FILESDIR}/${PN}-2.6.74070.patch
 	${FILESDIR}/${PN}-2.6.77666.patch
 	${FILESDIR}/${PN}-2.6.77923.patch
+	${FILESDIR}/${PN}-2.6.78362.patch
+	${FILESDIR}/${PN}-2.4.78363.patch
 	${FILESDIR}/${PN}-2.6.81106.patch
 	${FILESDIR}/${PN}-2.6.82141.patch"