• C
    net: ip, diag -- Adjust raw_abort to use unlocked __udp_disconnect · 3de864f8
    Cyrill Gorcunov 提交于
    While being preparing patches for killing raw sockets via
    diag netlink interface I noticed that my runs are stuck:
    
     | [root@pcs7 ~]# cat /proc/`pidof ss`/stack
     | [<ffffffff816d1a76>] __lock_sock+0x80/0xc4
     | [<ffffffff816d206a>] lock_sock_nested+0x47/0x95
     | [<ffffffff8179ded6>] udp_disconnect+0x19/0x33
     | [<ffffffff8179b517>] raw_abort+0x33/0x42
     | [<ffffffff81702322>] sock_diag_destroy+0x4d/0x52
    
    which has not been the case before. I narrowed it down to the commit
    
     | commit 286c72de
     | Author: Eric Dumazet <edumazet@google.com>
     | Date:   Thu Oct 20 09:39:40 2016 -0700
     |
     |     udp: must lock the socket in udp_disconnect()
    
    where we start locking the socket for different reason.
    
    So the raw_abort escaped the renaming and we have to
    fix this typo using __udp_disconnect instead.
    
    Fixes: 286c72de ("udp: must lock the socket in udp_disconnect()")
    CC: David S. Miller <davem@davemloft.net>
    CC: Eric Dumazet <eric.dumazet@gmail.com>
    CC: David Ahern <dsa@cumulusnetworks.com>
    CC: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
    CC: James Morris <jmorris@namei.org>
    CC: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
    CC: Patrick McHardy <kaber@trash.net>
    CC: Andrey Vagin <avagin@openvz.org>
    CC: Stephen Hemminger <stephen@networkplumber.org>
    Signed-off-by: NCyrill Gorcunov <gorcunov@openvz.org>
    Acked-by: NEric Dumazet <edumazet@google.com>
    Signed-off-by: NDavid S. Miller <davem@davemloft.net>
    3de864f8
raw.c 25.8 KB