diff options
| author |   Eric Dumazet <edumazet@google.com> | 2019-07-10 06:40:09 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-11 14:43:25 -0700 |
| commit | 052e0690f1f62f76493ba996d73847c7ca9fd132 (patch) | |
| tree | 8ff15b41b727c9e05530b2128fe1ec50459fab01 /net/ipv6 | |
| parent | ipv6: Use ipv6_authlen for len (diff) | |
| download | linux-dev-052e0690f1f62f76493ba996d73847c7ca9fd132.tar.xz linux-dev-052e0690f1f62f76493ba996d73847c7ca9fd132.zip | |
ipv6: tcp: fix flowlabels reflection for RST packets
In 323a53c41292 ("ipv6: tcp: enable flowlabel reflection in some RST packets")
and 50a8accf1062 ("ipv6: tcp: send consistent flowlabel in TIME_WAIT state")
we took care of IPv6 flowlabel reflections for two cases.
This patch takes care of the remaining case, when the RST packet
is sent on behalf of a 'full' socket.
In Marek use case, this was a socket in TCP_CLOSE state.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Marek Majkowski <marek@cloudflare.com>
Tested-by: Marek Majkowski <marek@cloudflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index d56a9019a0fe..5da069e91cac 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -984,8 +984,13 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) if (sk) { oif = sk->sk_bound_dev_if; - if (sk_fullsock(sk)) + if (sk_fullsock(sk)) { + const struct ipv6_pinfo *np = tcp_inet6_sk(sk); + trace_tcp_send_reset(sk, skb); + if (np->repflow) + label = ip6_flowlabel(ipv6h); + } if (sk->sk_state == TCP_TIME_WAIT) label = cpu_to_be32(inet_twsk(sk)->tw_flowlabel); } else { |