iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: Reject invalid ack_seq to Fast Open sockets

Browse Source 
A packet with an invalid ack_seq may cause a TCP Fast Open socket to switch
to the unexpected TCP_CLOSING state, triggering a BUG_ON kernel panic.

When a FIN packet with an invalid ack_seq# arrives at a socket in
the TCP_FIN_WAIT1 state, rather than discarding the packet, the current
code will accept the FIN, causing state transition to TCP_CLOSING.

This may be a small deviation from RFC793, which seems to say that the
packet should be dropped. Unfortunately I did not expect this case for
Fast Open hence it will trigger a BUG_ON panic.

It turns out there is really nothing bad about a TFO socket going into
TCP_CLOSING state so I could just remove the BUG_ON statements. But after
some thought I think it's better to treat this case like TCP_SYN_RECV
and return a RST to the confused peer who caused the unacceptable ack_seq
to be generated in the first place.

Signed-off-by: H.K. Jerry Chu <hkchu@google.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jerry Chu 2012-10-22 11:26:36 +00:00 committed by David S. Miller
parent 0b63bf1fe6
commit 37561f68bd
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/tcp_input.c
View File

@ -5964,7 +5964,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
req = tp->fastopen_rsk; req = tp->fastopen_rsk;
if (req != NULL) { if (req != NULL) {
BUG_ON(sk->sk_state != TCP_SYN_RECV && WARN_ON_ONCE(sk->sk_state != TCP_SYN_RECV &&
sk->sk_state != TCP_FIN_WAIT1); sk->sk_state != TCP_FIN_WAIT1);
if (tcp_check_req(sk, skb, req, NULL, true) == NULL) if (tcp_check_req(sk, skb, req, NULL, true) == NULL)
@ -6053,7 +6053,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
* ACK we have received, this would have acknowledged * ACK we have received, this would have acknowledged
* our SYNACK so stop the SYNACK timer. * our SYNACK so stop the SYNACK timer.
*/ */
if (acceptable && req != NULL) { if (req != NULL) {
/* Return RST if ack_seq is invalid.
* Note that RFC793 only says to generate a
* DUPACK for it but for TCP Fast Open it seems
* better to treat this case like TCP_SYN_RECV
* above.
*/
if (!acceptable)
return 1;
/* We no longer need the request sock. */ /* We no longer need the request sock. */
reqsk_fastopen_remove(sk, req, false); reqsk_fastopen_remove(sk, req, false);
tcp_rearm_rto(sk); tcp_rearm_rto(sk);

4
net/ipv4/tcp_timer.c
View File

@ -347,8 +347,8 @@ void tcp_retransmit_timer(struct sock *sk)
return; return;
} }
if (tp->fastopen_rsk) { if (tp->fastopen_rsk) {
BUG_ON(sk->sk_state != TCP_SYN_RECV && WARN_ON_ONCE(sk->sk_state != TCP_SYN_RECV &&
sk->sk_state != TCP_FIN_WAIT1); sk->sk_state != TCP_FIN_WAIT1);
tcp_fastopen_synack_timer(sk); tcp_fastopen_synack_timer(sk);
/* Before we receive ACK to our SYN-ACK don't retransmit /* Before we receive ACK to our SYN-ACK don't retransmit
* anything else (e.g., data or FIN segments). * anything else (e.g., data or FIN segments).