summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-11-28 11:52:23 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-11-28 11:52:23 +0000
commit98e70082bf3f4eb03e932698c29481bcc70ae798 (patch)
treef76bef5429718baace73c80733cc934d16d0e32f /sys-kernel/win4lin-sources
parentfix src_uri (Manifest recommit) (diff)
downloadgentoo-2-98e70082bf3f4eb03e932698c29481bcc70ae798.tar.gz
gentoo-2-98e70082bf3f4eb03e932698c29481bcc70ae798.tar.bz2
gentoo-2-98e70082bf3f4eb03e932698c29481bcc70ae798.zip
Adding fixed 2.6 AF_UNIX security patch for 2.6 branch; bug #72688.
Diffstat (limited to 'sys-kernel/win4lin-sources')
-rw-r--r--sys-kernel/win4lin-sources/ChangeLog6
-rw-r--r--sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.AF_UNIX.patch24
-rw-r--r--sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r2.ebuild4
3 files changed, 31 insertions, 3 deletions
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}