Skip to content

Commit

Permalink
tcp: reset sk_rx_dst in tcp_disconnect()
Browse files Browse the repository at this point in the history
commit d747a7a upstream.

We have to reset the sk->sk_rx_dst when we disconnect a TCP
connection, because otherwise when we re-connect it this
dst reference is simply overridden in tcp_finish_connect().

This fixes a dst leak which leads to a loopback dev refcnt
leak. It is a long-standing bug, Kevin reported a very similar
(if not same) bug before. Thanks to Andrei for providing such
a reliable reproducer which greatly narrows down the problem.

Fixes: 41063e9 ("ipv4: Early TCP socket demux.")
Reported-by: Andrei Vagin <[email protected]>
Reported-by: Kevin Xu <[email protected]>
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
congwang authored and gregkh committed Jul 21, 2017
1 parent e88fa5f commit 24b8df0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/ipv4/tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2268,6 +2268,8 @@ int tcp_disconnect(struct sock *sk, int flags)
tcp_init_send_head(sk);
memset(&tp->rx_opt, 0, sizeof(tp->rx_opt));
__sk_dst_reset(sk);
dst_release(sk->sk_rx_dst);
sk->sk_rx_dst = NULL;

WARN_ON(inet->inet_num && !icsk->icsk_bind_hash);

Expand Down

0 comments on commit 24b8df0

Please sign in to comment.