• Rainer Weikusat's avatar
    af_unix: Guard against other == sk in unix_dgram_sendmsg · a5527dda
    Rainer Weikusat authored
    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: 7d267278 ("unix: avoid use-after-free in ep_remove_wait_queue")
    Reported-By: default avatarPhilipp Hahn <pmhahn@pmhahn.de>
    Signed-off-by: default avatarRainer Weikusat <rweikusat@mobileactivedefense.com>
    Tested-by: default avatarPhilipp Hahn <pmhahn@pmhahn.de>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    a5527dda
af_unix.c 68 KB