vrf: Check skb for XFRM_TRANSFORMED flag (16b9db1c) · Commits · 戴 / test

To avoid a loop with qdiscs and xfrms, check if the skb has already gone through the qdisc attached to the VRF device and then to the xfrm layer. If so, no need for a second redirect. Fixes: ("net: Introduce VRF device driver") Reported-by:

Trev Larock <trev@larock.ca> Signed-off-by:

David Ahern <dsahern@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/vrf.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -474,7 +474,8 @@ static struct sk_buff vrf_ip6_out(struct net_device vrf_dev,
		if (rt6_need_strict(&ipv6_hdr(skb)->daddr))
		return skb;

		if (qdisc_tx_is_default(vrf_dev))
		if (qdisc_tx_is_default(vrf_dev) \|\|
		IP6CB(skb)->flags & IP6SKB_XFRM_TRANSFORMED)
		return vrf_ip6_out_direct(vrf_dev, sk, skb);

		return vrf_ip6_out_redirect(vrf_dev, skb);
		@@ -686,7 +687,8 @@ static struct sk_buff vrf_ip_out(struct net_device vrf_dev,
		ipv4_is_lbcast(ip_hdr(skb)->daddr))
		return skb;

		if (qdisc_tx_is_default(vrf_dev))
		if (qdisc_tx_is_default(vrf_dev) \|\|
		IPCB(skb)->flags & IPSKB_XFRM_TRANSFORMED)
		return vrf_ip_out_direct(vrf_dev, sk, skb);

		return vrf_ip_out_redirect(vrf_dev, skb);

Admin message