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 286c72deabaa240b7eebbd99496ed3324d69f3c0 | Author: Eric Dumazet <[email protected]> | 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. CC: David S. Miller <[email protected]> CC: Eric Dumazet <[email protected]> CC: David Ahern <[email protected]> CC: Alexey Kuznetsov <[email protected]> CC: James Morris <[email protected]> CC: Hideaki YOSHIFUJI <[email protected]> CC: Patrick McHardy <[email protected]> CC: Andrey Vagin <[email protected]> CC: Stephen Hemminger <[email protected]> Signed-off-by: Cyrill Gorcunov <[email protected]> --- On top of net-next tree 22ca904ad70afc831d8503e80be1b6558a978759 net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-ml.git/net/ipv4/raw.c =================================================================== --- linux-ml.git.orig/net/ipv4/raw.c +++ linux-ml.git/net/ipv4/raw.c @@ -920,7 +920,7 @@ int raw_abort(struct sock *sk, int err) sk->sk_err = err; sk->sk_error_report(sk); - udp_disconnect(sk, 0); + __udp_disconnect(sk, 0); release_sock(sk);
