]> www.infradead.org Git - users/jedix/linux-maple.git/commit
af_unix: Guard against other == sk in unix_dgram_sendmsg
authorRainer Weikusat <rweikusat@mobileactivedefense.com>
Thu, 11 Feb 2016 19:37:27 +0000 (19:37 +0000)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:45:22 +0000 (15:45 -0700)
commit3c9ddb079f1c5c00d853f788f13f108d06a99d6e
treedd1d699510c551263e6a8878c95495360f72584e
parente2c58e5921bcd15f948dc945cf1e6437639e653a
af_unix: Guard against other == sk in unix_dgram_sendmsg

Orabug: 23330954

[ Upstream commit a5527dda344fff0514b7989ef7a755729769daa1 ]

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@pmhahn.de>
Signed-off-by: Rainer Weikusat <rweikusat@mobileactivedefense.com>
Tested-by: Philipp Hahn <pmhahn@pmhahn.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 73fd505d34328b113fb9743688f245991409a830)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
net/unix/af_unix.c