Commit 3b7c3710 authored Nov 18, 2021 by Eric Dumazet Committed by Greg Kroah-Hartman Dec 01, 2021

ipv6: fix typos in __ip6_finish_output()



[ Upstream commit 19d36c5f294879949c9d6f57cb61d39cc4c48553 ]

We deal with IPv6 packets, so we need to use IP6CB(skb)->flags and
IP6SKB_REROUTED, instead of IPCB(skb)->flags and IPSKB_REROUTED

Found by code inspection, please double check that fixing this bug
does not surface other bugs.

Fixes: 09ee9dba ("ipv6: Reinject IPv6 packets if IPsec policy matches after SNAT")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Tobias Brunner <tobias@strongswan.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: David Ahern <dsahern@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Tested-by: Tobias Brunner <tobias@strongswan.org>
Acked-by: Tobias Brunner <tobias@strongswan.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 482522c1

net/ipv6/ip6_output.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -175,7 +175,7 @@ static int ip6_finish_output(struct net net, struct sock sk, struct sk_buff *s
	#if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM)		#if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM)
	/* Policy lookup after SNAT yielded a new policy */		/* Policy lookup after SNAT yielded a new policy */
	if (skb_dst(skb)->xfrm) {		if (skb_dst(skb)->xfrm) {
	IPCB(skb)->flags \|= IPSKB_REROUTED;		IP6CB(skb)->flags \|= IP6SKB_REROUTED;
	return dst_output(net, sk, skb);		return dst_output(net, sk, skb);
	}		}
	#endif		#endif