Merge "tcp: Reset tcp connections in SYN-SENT state"

This commit is contained in:
qctecmdr 2020-04-17 16:31:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit 899d1ad7dd

View file

@ -2513,7 +2513,7 @@ static inline bool tcp_need_reset(int state)
{
return (1 << state) &
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT | TCPF_FIN_WAIT1 |
TCPF_FIN_WAIT2 | TCPF_SYN_RECV);
TCPF_FIN_WAIT2 | TCPF_SYN_RECV | TCPF_SYN_SENT);
}
static void tcp_rtx_queue_purge(struct sock *sk)
@ -2579,8 +2579,7 @@ int tcp_disconnect(struct sock *sk, int flags)
*/
tcp_send_active_reset(sk, gfp_any());
sk->sk_err = ECONNRESET;
} else if (old_state == TCP_SYN_SENT)
sk->sk_err = ECONNRESET;
}
tcp_clear_xmit_timers(sk);
__skb_queue_purge(&sk->sk_receive_queue);