tcp: purge write queue upon aborting the connection
[ Upstream commitpull/10/heade05836ac07
] When the connection is aborted, there is no point in keeping the packets on the write queue until the connection is closed. Similar toa27fd7a8ed
('tcp: purge write queue upon RST'), this is essential for a correct MSG_ZEROCOPY implementation, because userspace cannot call close(fd) before receiving zerocopy signals even when the connection is aborted. Fixes:f214f915e7
("tcp: enable MSG_ZEROCOPY") Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: Neal Cardwell <ncardwell@google.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
dbbf2d1e40
commit
e44c173305
|
@ -3445,6 +3445,7 @@ int tcp_abort(struct sock *sk, int err)
|
||||||
|
|
||||||
bh_unlock_sock(sk);
|
bh_unlock_sock(sk);
|
||||||
local_bh_enable();
|
local_bh_enable();
|
||||||
|
tcp_write_queue_purge(sk);
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,7 @@ static void tcp_write_err(struct sock *sk)
|
||||||
sk->sk_err = sk->sk_err_soft ? : ETIMEDOUT;
|
sk->sk_err = sk->sk_err_soft ? : ETIMEDOUT;
|
||||||
sk->sk_error_report(sk);
|
sk->sk_error_report(sk);
|
||||||
|
|
||||||
|
tcp_write_queue_purge(sk);
|
||||||
tcp_done(sk);
|
tcp_done(sk);
|
||||||
__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONTIMEOUT);
|
__NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONTIMEOUT);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue