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

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index 1b50cc81794f497558968c8a6d6addbbc14d95f5..a47d2cb47b35efc625dcc7eb3f90af91eb5887e8 100644 (file)
--- 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 3ce69ae0d82ac057eb8f76dadec858306336308b..240fff4c70ed49e094e55c9eaf047abb876fb2b7 100644 (file)
--- 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 (file)
index 0000000..a95e94f
--- /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/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 509ba29bb66cad8ca4612a9d9c7e9839ddcdc8b3..03914ad9c75f50973222b71d0cc464fcd7b24648 100644 (file)
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.23 2004/11/27 18:25:13 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.24 2004/11/28 11:56:06 plasmaroo Exp $
+
+  28 Nov 2004; <plasmaroo@gentoo.org> uclinux-sources-2.6.7_p0-r10.ebuild,
+  +files/uclinux-sources-2.6.AF_UNIX.patch:
+  Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.
 
 *uclinux-sources-2.6.7_p0-r10 (27 Nov 2004)
 

diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.AF_UNIX.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.AF_UNIX.patch
new file mode 100644 (file)
index 0000000..a95e94f
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-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/uclinux-sources/uclinux-sources-2.6.7_p0-r10.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r10.ebuild
index b8530ac0160c85d38373845adc4b25b404b0960d..1e79e9b2bcb6dbd9d094e35304aa276892ae482d 100644 (file)
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r10.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r10.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/uclinux-sources/uclinux-sources-2.6.7_p0-r10.ebuild,v 1.1 2004/11/27 18:25:13 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r10.ebuild,v 1.2 2004/11/28 11:56:06 plasmaroo Exp $
 
 IUSE=""
 
@@ -52,7 +52,7 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}-2.6.devPtmx.patch || die "Failed to apply /dev/ptmx patch!"
        epatch ${FILESDIR}/${PN}-2.6.binfmt_elf.patch || die "Failed to apply binfmt_elf patch!"
        epatch ${FILESDIR}/${PN}-2.6.smbfs.patch || die "Failed to apply SMBFS patch!"
-       epatch ${FILESDIR}/${PN}.AF_UNIX.patch || die "Failed to apply the AF_UNIX patch!"
+       epatch ${FILESDIR}/${PN}-2.6.AF_UNIX.patch || die "Failed to apply the AF_UNIX patch!"
        epatch ${FILESDIR}/${PN}-2.6.binfmt_a.out.patch || die "Failed to apply the a.out patch!"
 
        set MY_ARCH=${ARCH}

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 342dcf1f5fe24643ab9df5b564c8a3919cf71cd3..55ed3a79be8450d10a7b8a664c1701113b8434ac 100644 (file)
--- 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 (file)
index 0000000..a95e94f
--- /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 f3041f8fb52b76aff9154ce2104c6abd3a86d1ca..2fffd8215cdf0267bd8cc868511a9dfd95d7314a 100644 (file)
--- 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 3ada29a676f2ffa12e7ad098f45690fb2cf5a977..ec8a1043eb52b0109bdf4f771426ef7130a69d39 100644 (file)
--- 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 (file)
index 0000000..a95e94f
--- /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 d626119cca3aae068f02ec5477223ce9e3ca0a06..4daf4cce7e5150e3921ca171335a5f4e6c84e550 100644 (file)
--- 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}
 

diff --git a/sys-kernel/xbox-sources/ChangeLog b/sys-kernel/xbox-sources/ChangeLog
index e1d32cbbe0ca9ec7a23e92c75ad22e186a856f86..b049cfcc3eb42863a93c60e254b7546606a425a7 100644 (file)
--- a/sys-kernel/xbox-sources/ChangeLog
+++ b/sys-kernel/xbox-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/xbox-sources
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/ChangeLog,v 1.20 2004/11/27 18:08:56 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/ChangeLog,v 1.21 2004/11/28 11:57:52 plasmaroo Exp $
+
+  28 Nov 2004; <plasmaroo@gentoo.org> xbox-sources-2.6.8.1-r5.ebuild,
+  +files/xbox-sources-2.6.8.1.AF_UNIX.patch:
+  Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.
 
 *xbox-sources-2.4.28-r1 (27 Nov 2004)
 

diff --git a/sys-kernel/xbox-sources/files/xbox-sources-2.6.8.1.AF_UNIX.patch b/sys-kernel/xbox-sources/files/xbox-sources-2.6.8.1.AF_UNIX.patch
new file mode 100644 (file)
index 0000000..a95e94f
--- /dev/null
+++ b/sys-kernel/xbox-sources/files/xbox-sources-2.6.8.1.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/xbox-sources/xbox-sources-2.6.8.1-r5.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r5.ebuild
index ad60c74215c1abb05589f90f8ac9408596356659..1a5341c1ff356b8d62884395c022d3e8a7f44b31 100644 (file)
--- a/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r5.ebuild
+++ b/sys-kernel/xbox-sources/xbox-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/xbox-sources/xbox-sources-2.6.8.1-r5.ebuild,v 1.1 2004/11/27 18:08:56 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.6.8.1-r5.ebuild,v 1.2 2004/11/28 11:57:52 plasmaroo Exp $
 
 ETYPE='sources'
 inherit kernel-2
@@ -19,7 +19,7 @@ UNIPATCH_LIST="
        ${FILESDIR}/${P}.smbfs.patch
        ${FILESDIR}/${P}.binfmt_elf.patch
        ${FILESDIR}/${P}.binfmt_a.out.patch
-       ${FILESDIR}/${PN}.AF_UNIX.patch"
+       ${FILESDIR}/${P}.AF_UNIX.patch"
 DESCRIPTION='Full sources for the Xbox Linux kernel'
 SRC_URI="${KERNEL_URI}
        mirror://gentoo/${XBOX_PATCHES}