[linux] 02/02: af_unix: Guard against other == sk in unix_dgram_sendmsg (regression in 3.2.73-2+deb7u1)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit fde4338562487d7f26f1179fd8c48334c2ebd39b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Feb 13 00:03:31 2016 +0000

    af_unix: Guard against other == sk in unix_dgram_sendmsg (regression in 3.2.73-2+deb7u1)
---
 debian/changelog                                   |  2 ++
 ...rd-against-other-sk-in-unix_dgram_sendmsg.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b48e344..0e6e2c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ linux (3.2.73-2+deb7u3) UNRELEASED; urgency=medium
     (Closes: #812207)
     - tiny, extract a new func xino_fwrite_wkq()
     - XINO handles EINTR from the dying process
+  * af_unix: Guard against other == sk in unix_dgram_sendmsg
+    (regression in 3.2.73-2+deb7u1)
 
   [ Salvatore Bonaccorso ]
   * unix: properly account for FDs passed over unix sockets (CVE-2013-4312)
diff --git a/debian/patches/bugfix/all/af_unix-guard-against-other-sk-in-unix_dgram_sendmsg.patch b/debian/patches/bugfix/all/af_unix-guard-against-other-sk-in-unix_dgram_sendmsg.patch
new file mode 100644
index 0000000..0be82d9
--- /dev/null
+++ b/debian/patches/bugfix/all/af_unix-guard-against-other-sk-in-unix_dgram_sendmsg.patch
@@ -0,0 +1,40 @@
+From: Rainer Weikusat <rweikusat at mobileactivedefense.com>
+Date: Thu, 11 Feb 2016 19:37:27 +0000
+Subject: af_unix: Guard against other == sk in unix_dgram_sendmsg
+Origin: http://mid.gmane.org/87r3gj11jc.fsf_-_@doppelsaurus.mobileactivedefense.com
+
+The unix_dgram_sendmsg routine use the following test
+
+if (unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
+
+to determine if sk and other are in an n:1 association (either
+established via connect or by using sendto to send messages to an
+unrelated socket identified by address). This isn't correct as the
+specified address could have been bound to the sending socket itself or
+because this socket could have been connected to itself by the time of
+the unix_peer_get but disconnected before the unix_state_lock(other). In
+both cases, the if-block would be entered despite other == sk which
+might either block the sender unintentionally or lead to trying to unlock
+the same spin lock twice for a non-blocking send. Add a other != sk
+check to guard against this.
+
+Fixes: 7d267278a9ec ("unix: avoid use-after-free in ep_remove_wait_queue")
+Reported-By: Philipp Hahn <pmhahn at pmhahn.de>
+Signed-off-by: Rainer Weikusat <rweikusat at mobileactivedefense.com>
+---
+--- a/net/unix/af_unix.c
++++ b/net/unix/af_unix.c
+@@ -1694,7 +1694,12 @@ restart_locked:
+ 			goto out_unlock;
+ 	}
+ 
+-	if (unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
++	/* other == sk && unix_peer(other) != sk if
++	 * - unix_peer(sk) == NULL, destination address bound to sk
++	 * - unix_peer(sk) == sk by time of get but disconnected before lock
++	 */
++	if (other != sk &&
++	    unlikely(unix_peer(other) != sk && unix_recvq_full(other))) {
+ 		if (timeo) {
+ 			timeo = unix_wait_for_peer(other, timeo);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4dbe9ac..201e4da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1202,3 +1202,4 @@ bugfix/x86/x86-mm-Improve-switch_mm-barrier-comments.patch
 bugfix/all/iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch
 bugfix/all/aufs-tiny-extract-a-new-func-xino_fwrite_wkq.patch
 bugfix/all/aufs-for-4.3-xino-handles-eintr-from-the-dying-proce.patch
+bugfix/all/af_unix-guard-against-other-sk-in-unix_dgram_sendmsg.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git