diff options
author | Eric Dumazet <edumazet@google.com> | 2018-10-01 23:24:26 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-02 22:17:35 -0700 |
commit | 8873c064d1de579ea23412a6d3eee972593f142b (patch) | |
tree | c7c1d16fc8403b48ff2b5f0cd8775b9f383ceea5 /include/net | |
parent | 744486d426dce4e4dc25fd2ce750116a0025736c (diff) | |
download | linux-8873c064d1de579ea23412a6d3eee972593f142b.tar.bz2 |
tcp: do not release socket ownership in tcp_close()
syzkaller was able to hit the WARN_ON(sock_owned_by_user(sk));
in tcp_close()
While a socket is being closed, it is very possible other
threads find it in rtnetlink dump.
tcp_get_info() will acquire the socket lock for a short amount
of time (slow = lock_sock_fast(sk)/unlock_sock_fast(sk, slow);),
enough to trigger the warning.
Fixes: 67db3e4bfbc9 ("tcp: no longer hold ehash lock while calling tcp_get_info()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 38cae35f6e16..751549ac0a84 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1492,6 +1492,7 @@ static inline void lock_sock(struct sock *sk) lock_sock_nested(sk, 0); } +void __release_sock(struct sock *sk); void release_sock(struct sock *sk); /* BH context may only use the following locking interface. */ |