diff options
| author | Eric Dumazet <edumazet@google.com> | 2022-04-15 17:10:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-04-17 13:31:31 +0100 |
| commit | b5ec1e6205a1cb719ab188472f00ae81b0800f2e (patch) | |
| tree | a483a9bb89b43f60b98ff98e8502d5d95e9979b2 /net/ipv4/tcp_input.c | |
| parent | d9d024f96609016628d750ebc8ee4a6f0d80e6e1 (diff) | |
| download | linux-b5ec1e6205a1cb719ab188472f00ae81b0800f2e.tar.gz linux-b5ec1e6205a1cb719ab188472f00ae81b0800f2e.tar.bz2 linux-b5ec1e6205a1cb719ab188472f00ae81b0800f2e.zip | |
tcp: get rid of rst_seq_match
Small cleanup in tcp_validate_incoming(), no need for rst_seq_match
setting and testing.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d4bc71779170..b2d5fbef6ce3 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5667,7 +5667,6 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, const struct tcphdr *th, int syn_inerr) { struct tcp_sock *tp = tcp_sk(sk); - bool rst_seq_match = false; /* RFC1323: H1. Apply PAWS check first. */ if (tcp_fast_parse_options(sock_net(sk), skb, th, tp) && @@ -5717,9 +5716,10 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, * Send a challenge ACK */ if (TCP_SKB_CB(skb)->seq == tp->rcv_nxt || - tcp_reset_check(sk, skb)) { - rst_seq_match = true; - } else if (tcp_is_sack(tp) && tp->rx_opt.num_sacks > 0) { + tcp_reset_check(sk, skb)) + goto reset; + + if (tcp_is_sack(tp) && tp->rx_opt.num_sacks > 0) { struct tcp_sack_block *sp = &tp->selective_acks[0]; int max_sack = sp[0].end_seq; int this_sack; @@ -5732,12 +5732,9 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb, } if (TCP_SKB_CB(skb)->seq == max_sack) - rst_seq_match = true; + goto reset; } - if (rst_seq_match) - goto reset; - /* Disable TFO if RST is out-of-order * and no data has been received * for current active TFO socket |