Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.

9 files changed, 93 insertions, 9 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 1b50cc81794f..a47d2cb47b35 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.70 2004/11/27 17:49:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.71 2004/11/28 11:52:23 plasmaroo Exp $
+
+  28 Nov 2004; <plasmaroo@gentoo.org> ck-sources-2.6.9-r3.ebuild,
+  +files/ck-sources-2.6.9.AF_UNIX.patch:
+  Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.
 
 *ck-sources-2.4.27-r4 (27 Nov 2004)
 
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.9-r3.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.9-r3.ebuild
index 3ce69ae0d82a..240fff4c70ed 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.9-r3.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.9-r3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.9-r3.ebuild,v 1.5 2004/11/27 17:49:41 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.9-r3.ebuild,v 1.6 2004/11/28 11:52:23 plasmaroo Exp $
 
 UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2
 	${FILESDIR}/${P}.binfmt_elf.patch
 	${FILESDIR}/${P}.binfmt_a.out.patch
-	${FILESDIR}/${PN}.AF_UNIX.patch"
+	${FILESDIR}/${P}.AF_UNIX.patch"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.9.AF_UNIX.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.9.AF_UNIX.patch
new file mode 100644
index 000000000000..a95e94fd9362
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-2.6.9.AF_UNIX.patch
@@ -0,0 +1,24 @@
+--- linux-2.6.9/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
++++ linux-2.6.9.plasmaroo/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
+@@ -1535,9 +1535,11 @@
+ 
+ 	msg->msg_namelen = 0;
+ 
++	down(&u->readsem);
++
+ 	skb = skb_recv_datagram(sk, flags, noblock, &err);
+ 	if (!skb)
+-		goto out;
++		goto out_unlock;
+ 
+ 	wake_up_interruptible(&u->peer_wait);
+ 
+@@ -1587,6 +1589,8 @@
+ 
+ out_free:
+ 	skb_free_datagram(sk,skb);
++out_unlock:
++	up(&u->readsem);
+ out:
+ 	return err;
+ }
diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 342dcf1f5fe2..55ed3a79be84 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.53 2004/11/27 20:04:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.54 2004/11/28 11:50:35 plasmaroo Exp $
+
+  28 Nov 2004; <plasmaroo@gentoo.org> usermode-sources-2.6.8.1-r5.ebuild,
+  +files/usermode-sources-2.6.AF_UNIX.patch:
+  Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.
 
 *usermode-sources-2.6.8.1-r5 (27 Nov 2004)
 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.AF_UNIX.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.AF_UNIX.patch
new file mode 100644
index 000000000000..a95e94fd9362
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.AF_UNIX.patch
@@ -0,0 +1,24 @@
+--- linux-2.6.9/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
++++ linux-2.6.9.plasmaroo/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
+@@ -1535,9 +1535,11 @@
+ 
+ 	msg->msg_namelen = 0;
+ 
++	down(&u->readsem);
++
+ 	skb = skb_recv_datagram(sk, flags, noblock, &err);
+ 	if (!skb)
+-		goto out;
++		goto out_unlock;
+ 
+ 	wake_up_interruptible(&u->peer_wait);
+ 
+@@ -1587,6 +1589,8 @@
+ 
+ out_free:
+ 	skb_free_datagram(sk,skb);
++out_unlock:
++	up(&u->readsem);
+ out:
+ 	return err;
+ }
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild
index f3041f8fb52b..2fffd8215cdf 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.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/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild,v 1.1 2004/11/27 20:04:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild,v 1.2 2004/11/28 11:50:35 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -16,7 +16,7 @@ UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
 	${FILESDIR}/${PN}-2.6.binfmt_elf.patch
 	${FILESDIR}/${PN}-2.6.smbfs.patch
 	${FILESDIR}/${PN}-2.6.binfmt_a.out.patch
-	${FILESDIR}/${PN}.AF_UNIX.patch"
+	${FILESDIR}/${PN}-2.6.AF_UNIX.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 3ada29a676f2..ec8a1043eb52 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,10 @@
 # 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.43 2004/11/27 19:29:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.44 2004/11/28 11:47:54 plasmaroo Exp $
+
+  28 Nov 2004; <plasmaroo@gentoo.org> win4lin-sources-2.6.9-r2.ebuild,
+  +files/win4lin-sources-2.6.9.AF_UNIX.patch:
+  Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.
 
 *win4lin-sources-2.4.26-r10 (27 Nov 2004)
 
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.AF_UNIX.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.AF_UNIX.patch
new file mode 100644
index 000000000000..a95e94fd9362
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.AF_UNIX.patch
@@ -0,0 +1,24 @@
+--- linux-2.6.9/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
++++ linux-2.6.9.plasmaroo/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
+@@ -1535,9 +1535,11 @@
+ 
+ 	msg->msg_namelen = 0;
+ 
++	down(&u->readsem);
++
+ 	skb = skb_recv_datagram(sk, flags, noblock, &err);
+ 	if (!skb)
+-		goto out;
++		goto out_unlock;
+ 
+ 	wake_up_interruptible(&u->peer_wait);
+ 
+@@ -1587,6 +1589,8 @@
+ 
+ out_free:
+ 	skb_free_datagram(sk,skb);
++out_unlock:
++	up(&u->readsem);
+ out:
+ 	return err;
+ }
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r2.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r2.ebuild
index d626119cca3a..4daf4cce7e51 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r2.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r2.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.9-r2.ebuild,v 1.1 2004/11/27 19:29:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r2.ebuild,v 1.2 2004/11/28 11:47:54 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -13,7 +13,7 @@ UNIPATCH_LIST="
 	${FILESDIR}/${P}.binfmt_elf.patch
 	${FILESDIR}/${P}.binfmt_a.out.patch
 	${FILESDIR}/${P}.smbfs.patch
-	${FILESDIR}/${PN}.AF_UNIX.patch"
+	${FILESDIR}/${P}.AF_UNIX.patch"
 
 S=${WORKDIR}/linux-${KV}