]> Git Repo - linux.git/commit - net/ipv4/raw.c
net: ip, diag -- Adjust raw_abort to use unlocked __udp_disconnect
authorCyrill Gorcunov <[email protected]>
Tue, 1 Nov 2016 20:05:00 +0000 (23:05 +0300)
committerDavid S. Miller <[email protected]>
Wed, 2 Nov 2016 19:25:16 +0000 (15:25 -0400)
commit3de864f8c9e488fa57a28f5deb45bb808810ee92
treef63a9b3bce0fdded4777df74b529e7791e6cc3d3
parentcc89c323a30e73114a21fc125d2f841658a09987
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
 | [<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.

Fixes: 286c72deabaa ("udp: must lock the socket in udp_disconnect()")
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]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
net/ipv4/raw.c
This page took 0.055774 seconds and 4 git commands to generate.