From 3de864f8c9e488fa57a28f5deb45bb808810ee92 Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Tue, 1 Nov 2016 23:05:00 +0300 Subject: [PATCH] net: ip, diag -- Adjust raw_abort to use unlocked __udp_disconnect 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 | [] __lock_sock+0x80/0xc4 | [] lock_sock_nested+0x47/0x95 | [] udp_disconnect+0x19/0x33 | [] raw_abort+0x33/0x42 | [] sock_diag_destroy+0x4d/0x52 which has not been the case before. I narrowed it down to the commit | commit 286c72deabaa240b7eebbd99496ed3324d69f3c0 | Author: Eric Dumazet | 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: 286c72deabaa ("udp: must lock the socket in udp_disconnect()") CC: David S. Miller CC: Eric Dumazet CC: David Ahern CC: Alexey Kuznetsov CC: James Morris CC: Hideaki YOSHIFUJI CC: Patrick McHardy CC: Andrey Vagin CC: Stephen Hemminger Signed-off-by: Cyrill Gorcunov Acked-by: Eric Dumazet Signed-off-by: David S. Miller --- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index d78d738fb172..6a0bd68a565b 100644 --- a/net/ipv4/raw.c +++ b/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); -- 2.39.5