closing bug #72317

7 files changed, 122 insertions, 6 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index f4864f6cfbf6..23412dab95ee 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.72 2004/11/27 16:33:57 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.73 2004/12/02 19:55:44 voxus Exp $
+
+*openmosix-sources-2.4.24-r10 (02 Dec 2004)
+*openmosix-sources-2.4.27-r7 (02 Dec 2004)
+
+  02 Dec 2004; Konstantin Arkhipov <voxus@gentoo.org>:
+  +files/openmosix-sources-af_unix.patch,
+  -openmosix-sources-2.4.27-r6.ebuild,
+  +openmosix-sources-2.4.24-r10.ebuild,
+  +openmosix-sources-2.4.27-r7.ebuild:
+  Fixed af_unix vulnerability, closing #72317.
 
 *openmosix-sources-2.4.24-r9 (27 Nov 2004)
 *openmosix-sources-2.4.27-r6 (27 Nov 2004)
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index b4dd4ce8cd79..e26f0b9aafe6 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,19 +1,22 @@
-MD5 2834dd4300599023e70d6238af1e0f08 openmosix-sources-2.4.27-r6.ebuild 1852
 MD5 9082dc5b98893e38cbdc1680ddb6be67 openmosix-sources-2.4.24-r9.ebuild 3014
-MD5 f985428b0c741f5caf917b1fca24339b ChangeLog 13997
+MD5 59ba421e07d0be23c9e807d42f1a950e openmosix-sources-2.4.27-r7.ebuild 1978
+MD5 3d1cb152f1308aaa635b857da565bcd1 ChangeLog 14348
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
+MD5 0f84a67ae1f039990bda41e8d6c82e20 openmosix-sources-2.4.24-r10.ebuild 3093
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
+MD5 b0a1f80aff51d6601e8924329023b241 files/openmosix-sources-af_unix.patch 515
 MD5 d1ccc2047be533c992f67270a150a210 files/cmdline-proc-fix.patch 388
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/openmosix-sources.CAN-2004-0177.patch 384
 MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r9 359
-MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r6 296
+MD5 42009ab1ca8da78b30d2fcd15150f202 files/digest-openmosix-sources-2.4.27-r7 296
 MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch 1877
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/openmosix-sources.CAN-2004-0178.patch 424
 MD5 60d25ff310fc6abfdce39ec9e47345af files/openmosix-sources.CAN-2004-0685.patch 2809
 MD5 fa0b3a0117ce4a5701403bb7f1c5acdf files/openmosix-sources.CAN-2004-0841-fix_ldisc_switch.patch 878
+MD5 b5082064acd344757ff6362f7d60a881 files/digest-openmosix-sources-2.4.24-r10 359
 MD5 915e8d7a0618736caa44d96968015467 files/openmosix-sources-binfmt_elf.patch 2346
 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/openmosix-sources-2.4.27-smbfs.patch 3434
 MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r10 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r10
new file mode 100644
index 000000000000..e3b64d95ad6f
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r10
@@ -0,0 +1,5 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 1c9bc4f32a9fc793cb8f0a6d0f910cb7 openMosix-2.4.24-2.bz2 588330
+MD5 7e0e9f3d57bcc1b1bb7900ada383c129 linux-2.4.23-CAN-2004-0415.patch 89319
+MD5 d4c051e7c6062704be85192e25e2f5b2 linux-2.4.26-CAN-2004-0814.patch 81508
+MD5 5bbbb2201b338ebb74f0bf650b639475 linux-2.4.27-nfs3-xdr.patch.bz2 746
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r6 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r7
index b667a1620951..b667a1620951 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r6
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.27-r7
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-af_unix.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-af_unix.patch
new file mode 100644
index 000000000000..6ced78404a2d
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-af_unix.patch
@@ -0,0 +1,24 @@
+--- linux-2.4.27/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
++++ linux-2.4.28/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
+@@ -1403,9 +1403,11 @@
+ 
+ 	msg->msg_namelen = 0;
+ 
++	down(&sk->protinfo.af_unix.readsem);
++
+ 	skb = skb_recv_datagram(sk, flags, noblock, &err);
+ 	if (!skb)
+-		goto out;
++		goto out_unlock;
+ 
+ 	wake_up_interruptible(&sk->protinfo.af_unix.peer_wait);
+ 
+@@ -1449,6 +1451,8 @@
+ 
+ out_free:
+ 	skb_free_datagram(sk,skb);
++out_unlock:
++	up(&sk->protinfo.af_unix.readsem);
+ out:
+ 	return err;
+ }
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
new file mode 100644
index 000000000000..c7d586c05b0b
--- /dev/null
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r10.ebuild,v 1.1 2004/12/02 19:55:44 voxus Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel eutils
+
+OKV="2.4.24"
+OMV="2"
+[ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
+S=${WORKDIR}/linux-${KV}
+
+# What's in this kernel?
+
+# INCLUDED:
+#   2.4.22, plus:
+#   2.4.22  openmosix-2.4.22-3
+#			various security patches
+
+DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+mirror://sourceforge/openmosix/openMosix-${OKV}-${OMV}.bz2
+http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.23-CAN-2004-0415.patch
+http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0814.patch
+mirror://gentoo/linux-2.4.27-nfs3-xdr.patch.bz2"
+
+PROVIDE="virtual/linux-sources"
+HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
+LICENSE="GPL-2"
+SLOT="${KV}"
+KEYWORDS="-* ~x86"
+IUSE=""
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die
+	cd linux-${KV}
+
+	epatch ${DISTDIR}/openMosix-${OKV}-${OMV}.bz2 || die "openMosix patch failed"
+
+	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0001.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0010.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0177.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0495.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Security patch failed"
+	epatch ${FILESDIR}/cmdline-proc-fix.patch || die "Security patch failed"
+	epatch ${FILESDIR}/${PN}-binfmt_elf.patch || die "Security patch failed"
+
+	epatch ${DISTDIR}/linux-2.4.23-CAN-2004-0415.patch || die "Failed to add CAN-2004-0415"
+	epatch ${DISTDIR}/linux-2.4.26-CAN-2004-0814.patch || die "Failed to add CAN-2004-0814"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0841-fix_ldisc_switch.patch || die "Antipatch failed."
+	epatch ${DISTDIR}/linux-2.4.27-nfs3-xdr.patch.bz2 || die "Failed to add nfs3-xdk patch"
+	epatch ${FILESDIR}/${PN}-${PV}-smbfs.patch || die "Failed to add smbfs patch"
+	epatch ${FILESDIR}/${PN}-af_unix.patch || die "Failed to add af_unix patch"
+
+	kernel_universal_unpack
+}
+
+pkg_postinst() {
+	[ "$ETYPE" = "headers" ] && return
+	if [ ! -e ${ROOT}usr/src/linux ]
+	then
+		rm -f ${ROOT}usr/src/linux
+		ln -sf linux-${KV} ${ROOT}/usr/src/linux
+	fi
+}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r6.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r7.ebuild
index 2f27229fe130..533f2de6fece 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r6.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-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/openmosix-sources/openmosix-sources-2.4.27-r6.ebuild,v 1.1 2004/11/27 16:33:57 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.27-r7.ebuild,v 1.1 2004/12/02 19:55:44 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -40,6 +40,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0841-fix_ldisc_switch.patch || die "fix for CAN-2004-0814 patch failed."
 	epatch ${DISTDIR}/linux-${PV}-nfs3-xdr.patch.bz2 || die "security patch for nfs3-xdk failed."
 	epatch ${FILESDIR}/${PN}-binfmt_elf.patch || die "Security patch for binfmt_elf failed."
-	epatch ${FILESDIR}/${PN}-${PV}-smbfs.patch
+	epatch ${FILESDIR}/${PN}-${PV}-smbfs.patch || die "Security aptch for smbfs failed."
+	epatch ${FILESDIR}/${PN}-af_unix.patch || die "Security patch for af_unix failed."
 	kernel_universal_unpack
 }