diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2016-08-23 21:05:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-23 23:11:36 -0700 |
| commit | d7226c7a4dd19929d6df4ae04698da2fcf6f875a (patch) | |
| tree | 33b158ecdb0ed30ca22110588dc368b91a10f9ed /net/ipv4/tcp.c | |
| parent | 7b996243fab46092fb3a29c773c54be8152366e4 (diff) | |
| download | blackbird-obmc-linux-d7226c7a4dd19929d6df4ae04698da2fcf6f875a.tar.gz blackbird-obmc-linux-d7226c7a4dd19929d6df4ae04698da2fcf6f875a.zip | |
net: diag: Fix refcnt leak in error path destroying socket
inet_diag_find_one_icsk takes a reference to a socket that is not
released if sock_diag_destroy returns an error. Fix by changing
tcp_diag_destroy to manage the refcnt for all cases and remove
the sock_put calls from tcp_abort.
Fixes: c1e64e298b8ca ("net: diag: Support destroying TCP sockets")
Reported-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 032a96d78c99..ffbb218de520 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3193,7 +3193,6 @@ int tcp_abort(struct sock *sk, int err) local_bh_enable(); return 0; } - sock_gen_put(sk); return -EOPNOTSUPP; } @@ -3222,7 +3221,6 @@ int tcp_abort(struct sock *sk, int err) bh_unlock_sock(sk); local_bh_enable(); release_sock(sk); - sock_put(sk); return 0; } EXPORT_SYMBOL_GPL(tcp_abort); |
