Fixed the 2.4 kNFSd security vulnerability and the 2.6 /dev/ptmx DoS, bug #62524. Also fixed CAN-2004-0814 for 2.4 and 2.6, bug #68421.

7 files changed, 93 insertions, 6 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index cb6a6c716bf8..72447da14e1b 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.37 2004/10/21 18:33:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.38 2004/11/07 16:58:28 plasmaroo Exp $
+
+*win4lin-sources-2.6.7-r7 (07 Nov 2004)
+
+  07 Nov 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r6.ebuild,
+  +win4lin-sources-2.4.26-r7.ebuild, -win4lin-sources-2.6.7-r6.ebuild,
+  +win4lin-sources-2.6.7-r7.ebuild,
+  +files/win4lin-sources-2.4.26.XDRWrapFix.patch,
+  +files/win4lin-sources-2.6.devPtmx.patch:
+  Fixed the 2.4 kNFSd security vulnerability and the 2.6 /dev/ptmx DoS, bug
+  #62524. Also fixed CAN-2004-0814 for 2.4 and 2.6, bug #68421.
 
 *win4lin-sources-2.6.7-r6 (21 Oct 2004)
 
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r6 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r7
index 2c48322d68cd..fe975b03e980 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r6
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r7
@@ -2,3 +2,4 @@ MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483
 MD5 e9bc95992e489a3f54aabef100e13fcf Kernel-Win4Lin3-2.4.26.patch 23600
 MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
+MD5 d4c051e7c6062704be85192e25e2f5b2 linux-2.4.26-CAN-2004-0814.patch 81508
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r6 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r7
index bb24ec457f28..9e871718355b 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r6
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r7
@@ -2,3 +2,4 @@ MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 45347c8bd1a1c791e9a12d1e09162f33 mki-adapter26_1_3_6.patch 127032
 MD5 e5b7ca075f0281509442913cbd09ca26 Kernel-Win4Lin3-2.6.7.patch 26620
 MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
+MD5 c9c9ed2f30afd3750287953184100529 linux-2.6.7-CAN-2004-0814.patch 129565
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.XDRWrapFix.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.XDRWrapFix.patch
new file mode 100644
index 000000000000..9a336ab7876a
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.XDRWrapFix.patch
@@ -0,0 +1,48 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/16 14:50:04-03:00 neilb@cse.unsw.edu.au 
+#   [PATCH] Fixed possibly xdr parsing error if write size exceed 2^31
+#   
+#   xdr_argsize_check needs to cope with the possibility that the
+#   pointer has wrapped and could be below buf->base.
+#   
+#   Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
+#   
+#   ### Diffstat output
+#    ./fs/nfsd/nfs3xdr.c         |    2 +-
+#    ./include/linux/nfsd/xdr3.h |    2 +-
+#    2 files changed, 2 insertions(+), 2 deletions(-)
+# 
+# fs/nfsd/nfs3xdr.c
+#   2004/08/14 00:23:06-03:00 neilb@cse.unsw.edu.au +1 -1
+#   Fixed possibly xdr parsing error if write size exceed 2^31
+# 
+# include/linux/nfsd/xdr3.h
+#   2004/08/15 20:48:43-03:00 neilb@cse.unsw.edu.au +1 -1
+#   Fixed possibly xdr parsing error if write size exceed 2^31
+# 
+diff -Nru a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
+--- a/fs/nfsd/nfs3xdr.c	2004-09-06 11:20:28 -07:00
++++ b/fs/nfsd/nfs3xdr.c	2004-09-06 11:20:28 -07:00
+@@ -273,7 +273,7 @@
+ {
+ 	struct svc_buf	*buf = &rqstp->rq_argbuf;
+ 
+-	return p - buf->base <= buf->buflen;
++	return p >= buf->base && p <= buf->base + buf->buflen ;
+ }
+ 
+ static inline int
+diff -Nru a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
+--- a/include/linux/nfsd/xdr3.h	2004-09-06 11:20:28 -07:00
++++ b/include/linux/nfsd/xdr3.h	2004-09-06 11:20:28 -07:00
+@@ -41,7 +41,7 @@
+ 	__u32			count;
+ 	int			stable;
+ 	__u8 *			data;
+-	int			len;
++	__u32			len;
+ };
+ 
+ struct nfsd3_createargs {
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.devPtmx.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.devPtmx.patch
new file mode 100644
index 000000000000..2312a2bf5e3b
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.devPtmx.patch
@@ -0,0 +1,21 @@
+Index: linux-2.6.5/fs/devpts/inode.c
+===================================================================
+--- linux-2.6.5.orig/fs/devpts/inode.c
++++ linux-2.6.5/fs/devpts/inode.c
+@@ -178,9 +178,13 @@ struct tty_struct *devpts_get_tty(int nu
+ {
+ 	struct dentry *dentry = get_node(number);
+ 	struct tty_struct *tty;
+-
+-	tty = (IS_ERR(dentry) || !dentry->d_inode) ? NULL :
+-			dentry->d_inode->u.generic_ip;
++	
++	tty = NULL;
++	if (!IS_ERR(dentry)) {
++		if (dentry->d_inode)
++			tty = dentry->d_inode->u.generic_ip;
++		dput(dentry);
++	}
+ 
+ 	up(&devpts_root->d_inode->i_sem);
+ 
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r6.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r7.ebuild
index 6a18ea0ea5ef..bf8d9ca8b034 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r6.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r6.ebuild,v 1.1 2004/08/10 00:52:17 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r7.ebuild,v 1.1 2004/11/07 16:58:28 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -17,7 +17,8 @@ DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.netraverse.com/member/downloads/files/mki-adapter.patch
 	 http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
 HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
 KEYWORDS="x86"
 SLOT="${KV}"
@@ -37,8 +38,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
+	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!"
 	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
+	epatch ${FILESDIR}/${P}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!"
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r7.ebuild
index 79ea80a46e11..9af769aafa8c 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r6.ebuild,v 1.1 2004/10/21 18:33:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r7.ebuild,v 1.1 2004/11/07 16:58:28 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -10,13 +10,15 @@ MKI_VERSION='1_3_6'
 UNIPATCH_LIST="
 	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
 	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
+	${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch
 	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1
 	${FILESDIR}/${PN}.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
 	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
 	${FILESDIR}/${PN}-2.6.ProcPerms.patch
 	${FILESDIR}/${PN}-2.6.cmdlineLeak.patch
-	${FILESDIR}/${PN}-2.6.CAN-2004-0816.patch"
+	${FILESDIR}/${PN}-2.6.CAN-2004-0816.patch
+	${FILESDIR}/${PN}-2.6.devPtmx.patch"
 
 S=${WORKDIR}/linux-${KV}
 
@@ -24,7 +26,8 @@ DESCRIPTION="Full sources for the 2.6 of the Linux kernel with the Win4Lin patch
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
 	http://www.netraverse.com/member/downloads/files/mki-adapter26_${MKI_VERSION}.patch
 	http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
 
 # Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable;
 # bug #55587.