From: David S. Miller Date: Wed, 22 Apr 2020 19:32:11 +0000 (-0700) Subject: Merge branch 'vrf-looping' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=87f78f274db5e54f8bd1686aa5095ee17363b519;p=linux.git Merge branch 'vrf-looping' David Ahern says: ==================== net: Fix looping with vrf, xfrms and qdisc on VRF Trev reported that use of VRFs with xfrms is looping when a qdisc is added to the VRF device. The combination of xfrm + qdisc is not handled by the VRF driver which lost track that it has already seen the packet. The XFRM_TRANSFORMED flag is used by the netfilter code for a similar purpose, so re-use for VRF. Patch 1 drops the #ifdef around setting the flag in the xfrm output functions. Patch 2 adds a check to the VRF driver for flag; if set the packet has already passed through the VRF driver once and does not need to recirculated a second time. This is a day 1 bug with VRFs; stable wise, I would only take this back to 4.14. I have a set of test cases which I will submit to net-next. ==================== Signed-off-by: David S. Miller --- 87f78f274db5e54f8bd1686aa5095ee17363b519