Security fix: #72317 CAN-2004-1069, extra patch for AF_UNIX vuln.

5 files changed, 74 insertions, 5 deletions

diff --git a/sys-kernel/rsbac-dev-sources/ChangeLog b/sys-kernel/rsbac-dev-sources/ChangeLog
index 4e659fca2b9a..8401350a543f 100644
--- a/sys-kernel/rsbac-dev-sources/ChangeLog
+++ b/sys-kernel/rsbac-dev-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/rsbac-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.18 2004/12/16 18:43:00 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.19 2004/12/19 23:52:17 kang Exp $
+
+*rsbac-dev-sources-2.6.7-r11 (20 Dec 2004)
+
+  20 Dec 2004; Guillaume Destuynder <kang@gentoo.org>
+  -rsbac-dev-sources-2.6.7-r10.ebuild, +rsbac-dev-sources-2.6.7-r11.ebuild:
+  Security fix: #72317 CAN-2004-1069, extra patch for AF_UNIX vuln.
 
   16 Dec 2004; Guillaume Destuynder <kang@gentoo.org> :
   1.2.4pre + 2.6.9 in ~x86
diff --git a/sys-kernel/rsbac-dev-sources/Manifest b/sys-kernel/rsbac-dev-sources/Manifest
index a4f10baf6a8a..6972b6f92e9b 100644
--- a/sys-kernel/rsbac-dev-sources/Manifest
+++ b/sys-kernel/rsbac-dev-sources/Manifest
@@ -1,7 +1,7 @@
 MD5 ed6fb50f79e8049f3f3576bb25c32747 metadata.xml 465
-MD5 1f1720d0b3ae43fc73806a800e1ea48b ChangeLog 4719
-MD5 8935fe858917edc96958d71c945d1930 rsbac-dev-sources-2.6.7-r10.ebuild 1886
+MD5 2275975430780c2959ed659b3df96558 ChangeLog 4962
 MD5 094e8c4312eeeaa025f2d31dbfe3f01a rsbac-dev-sources-2.6.9.ebuild 1480
+MD5 06b26ac67e6e7cbd5aae43fdd1d3b511 rsbac-dev-sources-2.6.7-r11.ebuild 1925
 MD5 706d7794a822074aaf31502d7a7e48d3 files/2.6.7-cmdline.patch 455
 MD5 b6e38b41c8a79943df2ab2642149d06f files/rsbac-dev-sources-CAN-2004-0497.patch 2214
 MD5 f0e12ba218f53c2694a91259bdc2fdc7 files/rsbac-dev-sources-CAN-2004-0596.patch 494
@@ -15,7 +15,8 @@ MD5 452e04a312368605e145428c35bd0e05 files/rsbac-dev-sources-2.6.7-62524-ptmx.pa
 MD5 accdbfc81ddc59d568ed845b5972f10a files/rsbac-dev-sources-2.6.7-70681-binfmt.patch 2606
 MD5 7872d0af6e27fb6007833b113097bb34 files/rsbac-dev-sources-2.6.7-CAN-2004-0883.patch 3357
 MD5 530630d25910e6bd9376b63ea099655f files/rsbac-dev-sources-2.6.7-AF_UNIX.patch 469
-MD5 ee9c2340e890a15d199f98f98e027466 files/digest-rsbac-dev-sources-2.6.7-r10 281
 MD5 91dd923056c1af13054cb00fb0a8daa3 files/rsbac-dev-sources-2.6.7-dos_mem_disc1.patch 1578
 MD5 632a66f683783bebc9c7b565284284d0 files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch 7369
 MD5 76e034360be9c90c736b2440f39349d7 files/digest-rsbac-dev-sources-2.6.9 217
+MD5 4d656fa3f3a47df751c0d78b64ed8353 files/rsbac-dev-sources-CAN-2004-1069.patch 1761
+MD5 ee9c2340e890a15d199f98f98e027466 files/digest-rsbac-dev-sources-2.6.7-r11 281
diff --git a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r10 b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r11
index 19b8dd9a9c31..19b8dd9a9c31 100644
--- a/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r10
+++ b/sys-kernel/rsbac-dev-sources/files/digest-rsbac-dev-sources-2.6.7-r11
diff --git a/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-CAN-2004-1069.patch b/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-CAN-2004-1069.patch
new file mode 100644
index 000000000000..dbb8b2329a28
--- /dev/null
+++ b/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-CAN-2004-1069.patch
@@ -0,0 +1,61 @@
+--- a/net/unix/af_unix.c	2004-10-18 22:54:37.000000000 +0100
++++ b/net/unix/af_unix.c	2004-12-19 18:33:12.000000000 +0000
+@@ -477,6 +477,8 @@
+ 			      struct msghdr *, size_t, int);
+ static int unix_dgram_connect(struct socket *, struct sockaddr *,
+ 			      int, int);
++static int unix_seqpacket_sendmsg(struct kiocb *, struct socket *,
++				  struct msghdr *, size_t);
+ 
+ static struct proto_ops unix_stream_ops = {
+ 	.family =	PF_UNIX,
+@@ -535,7 +537,7 @@
+ 	.shutdown =	unix_shutdown,
+ 	.setsockopt =	sock_no_setsockopt,
+ 	.getsockopt =	sock_no_getsockopt,
+-	.sendmsg =	unix_dgram_sendmsg,
++	.sendmsg =	unix_seqpacket_sendmsg,
+ 	.recvmsg =	unix_dgram_recvmsg,
+ 	.mmap =		sock_no_mmap,
+ 	.sendpage =	sock_no_sendpage,
+@@ -1365,9 +1367,11 @@
+ 	if (other->sk_shutdown & RCV_SHUTDOWN)
+ 		goto out_unlock;
+ 
+-	err = security_unix_may_send(sk->sk_socket, other->sk_socket);
+-	if (err)
+-		goto out_unlock;
++	if (sk->sk_type != SOCK_SEQPACKET) {
++		err = security_unix_may_send(sk->sk_socket, other->sk_socket);
++		if (err)
++			goto out_unlock;
++	}
+ 
+ 	if (unix_peer(other) != sk &&
+ 	    (skb_queue_len(&other->sk_receive_queue) >
+@@ -1517,6 +1521,25 @@
+ 	return sent ? : err;
+ }
+ 
++static int unix_seqpacket_sendmsg(struct kiocb *kiocb, struct socket *sock,
++				  struct msghdr *msg, size_t len)
++{
++	int err;
++	struct sock *sk = sock->sk;
++	
++	err = sock_error(sk);
++	if (err)
++		return err;
++
++	if (sk->sk_state != TCP_ESTABLISHED)
++		return -ENOTCONN;
++
++	if (msg->msg_namelen)
++		msg->msg_namelen = 0;
++
++	return unix_dgram_sendmsg(kiocb, sock, msg, len);
++}
++                                                                                            
+ static void unix_copy_addr(struct msghdr *msg, struct sock *sk)
+ {
+ 	struct unix_sock *u = unix_sk(sk);
diff --git a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r10.ebuild b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r11.ebuild
index 9fe71cfb6ecd..f371b2a3d806 100644
--- a/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r10.ebuild
+++ b/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r11.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/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r10.ebuild,v 1.1 2004/12/08 19:53:28 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/rsbac-dev-sources-2.6.7-r11.ebuild,v 1.1 2004/12/19 23:52:17 kang Exp $
 
 IUSE=""
 ETYPE="sources"
@@ -19,6 +19,7 @@ RGPV_SRC="http://dev.gentoo.org/~kang/rsbac/patches/1.2.3/2.6/rsbac-patches-${KV
 UNIPATCH_STRICTORDER="yes"
 UNIPATCH_LIST="${FILESDIR}/${PN}-iptables-dos.patch
 	${FILESDIR}/${PN}-${OKV}-AF_UNIX.patch
+	${FILESDIR}/${PN}-CAN-2004-1069.patch
 	${FILESDIR}/${PN}-${OKV}-CAN-2004-0883.patch
 	${FILESDIR}/${PN}-CAN-2004-0497.patch
 	${FILESDIR}/${PN}-CAN-2004-0596.patch