| From 43b90bfad34bcb81b8a5bc7dc650800f4be1787e Mon Sep 17 00:00:00 2001 |
| From: Alexander Ovechkin <ovov@yandex-team.ru> |
| Date: Fri, 9 Jul 2021 18:28:23 +0300 |
| Subject: net: send SYNACK packet with accepted fwmark |
| |
| From: Alexander Ovechkin <ovov@yandex-team.ru> |
| |
| commit 43b90bfad34bcb81b8a5bc7dc650800f4be1787e upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv6/tcp_ipv6.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv6/tcp_ipv6.c |
| +++ b/net/ipv6/tcp_ipv6.c |
| @@ -540,7 +540,7 @@ static int tcp_v6_send_synack(const stru |
| 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); |
