From f7c4b49fcf5dc1858f52589d5c7c3815e8e97b95 Mon Sep 17 00:00:00 2001

From: Denis Kirjanov <denis.kirjanov@suse.com>

Date: Wed, 27 Jul 2022 11:23:59 +0300

Subject: [PATCH 4/8] vrf: Fix IPv6 with qdisc and xfrm

Git-commit: a53c102872ad6e34e1518e25899dc9498c27f8b1

Patch-mainline: v5.7-rc3

References: git-fixes

When a qdisc is attached to the VRF device, the packet goes down the ndo

xmit function which is setup to send the packet back to the VRF driver

which does a lookup to send the packet out. The lookup in the VRF driver

is not considering xfrm policies. Change it to use ip6_dst_lookup_flow

rather than ip6_route_output.

Fixes: 35402e313663 ("net: Add IPv6 support to VRF device")

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

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/vrf.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c

index 50139b8a6f4e..8a91e6480e6a 100644

--- a/drivers/net/vrf.c

+++ b/drivers/net/vrf.c

@@ -192,8 +192,8 @@ static netdev_tx_t vrf_process_v6_outbound(struct sk_buff *skb,

 	fl6.flowi6_proto = iph->nexthdr;

 	fl6.flowi6_flags = FLOWI_FLAG_SKIP_NH_OIF;

-	dst = ip6_route_output(net, NULL, &fl6;;

-	if (dst == dst_null)

+	dst = ip6_dst_lookup_flow__net(net, NULL, &fl6, NULL);

+	if (IS_ERR(dst) || dst == dst_null)

 		goto err;

 	skb_dst_drop(skb);

-- 

2.16.4