diff options
author | 2021-07-09 18:28:23 +0300 | |
---|---|---|
committer | 2021-07-09 11:24:02 -0700 | |
commit | 43b90bfad34bcb81b8a5bc7dc650800f4be1787e (patch) | |
tree | f2a25b76d989854b2ca3ad5bf144830c71482066 /net/ipv6/tcp_ipv6.c | |
parent | net: ti: fix UAF in tlan_remove_one (diff) | |
download | linux-43b90bfad34bcb81b8a5bc7dc650800f4be1787e.tar.gz linux-43b90bfad34bcb81b8a5bc7dc650800f4be1787e.tar.bz2 linux-43b90bfad34bcb81b8a5bc7dc650800f4be1787e.zip |
net: send SYNACK packet with accepted fwmark
commit e05a90ec9e16 ("net: reflect mark on tcp syn ack packets")
fixed IPv4 only.
This part is for the IPv6 side.
Fixes: e05a90ec9e16 ("net: reflect mark on tcp syn ack packets")
Signed-off-by: Alexander Ovechkin <ovov@yandex-team.ru>
Acked-by: Dmitry Yakunin <zeil@yandex-team.ru>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 323989927a0a..0ce52d46e4f8 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -555,7 +555,7 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst, opt = ireq->ipv6_opt; if (!opt) opt = rcu_dereference(np->opt); - err = ip6_xmit(sk, skb, fl6, sk->sk_mark, opt, + err = ip6_xmit(sk, skb, fl6, skb->mark ? : sk->sk_mark, opt, tclass, sk->sk_priority); rcu_read_unlock(); err = net_xmit_eval(err); |