diff mbox series

[net] ipv4: Restore flowi4_oif update before call to xfrm_lookup_route

Message ID 20201009180101.5092-1-dsahern@kernel.org (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series [net] ipv4: Restore flowi4_oif update before call to xfrm_lookup_route | expand

Commit Message

David Ahern Oct. 9, 2020, 6:01 p.m. UTC
Tobias reported regressions in IPsec tests following the patch
referenced by the Fixes tag below. The root cause is dropping the
reset of the flowi4_oif after the fib_lookup. Apparently it is
needed for xfrm cases, so restore the oif update to ip_route_output_flow
right before the call to xfrm_lookup_route.

Fixes: 2fbc6e89b2f1 ("ipv4: Update exception handling for multipath routes via same device")
Reported-by: Tobias Brunner <tobias@strongswan.org>
Signed-off-by: David Ahern <dsahern@kernel.org>
---
 net/ipv4/route.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Jakub Kicinski Oct. 10, 2020, 6:42 p.m. UTC | #1
On Fri,  9 Oct 2020 11:01:01 -0700 David Ahern wrote:
> Tobias reported regressions in IPsec tests following the patch
> referenced by the Fixes tag below. The root cause is dropping the
> reset of the flowi4_oif after the fib_lookup. Apparently it is
> needed for xfrm cases, so restore the oif update to ip_route_output_flow
> right before the call to xfrm_lookup_route.
> 
> Fixes: 2fbc6e89b2f1 ("ipv4: Update exception handling for multipath routes via same device")
> Reported-by: Tobias Brunner <tobias@strongswan.org>
> Signed-off-by: David Ahern <dsahern@kernel.org>

Applied and queued for stable, thank you!
diff mbox series

Patch

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 58642b29a499..9bd30fd4de4b 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2769,10 +2769,12 @@  struct rtable *ip_route_output_flow(struct net *net, struct flowi4 *flp4,
 	if (IS_ERR(rt))
 		return rt;
 
-	if (flp4->flowi4_proto)
+	if (flp4->flowi4_proto) {
+		flp4->flowi4_oif = rt->dst.dev->ifindex;
 		rt = (struct rtable *)xfrm_lookup_route(net, &rt->dst,
 							flowi4_to_flowi(flp4),
 							sk, 0);
+	}
 
 	return rt;
 }