ipv4: Restore flowi4_oif update before call to xfrm_lookup_route
authorDavid Ahern <dsahern@kernel.org>
Fri, 9 Oct 2020 18:01:01 +0000 (11:01 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 10 Oct 2020 18:38:59 +0000 (11:38 -0700)
commit874fb9e2ca949b443cc419a4f2227cafd4381d39
tree41a03c7533349f5714aa2e3e235a871aefc9e9df
parent49fb2f33f6a401d69002a30e804a786523a7b874
ipv4: Restore flowi4_oif update before call to xfrm_lookup_route

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>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/route.c