diff options
| author |   David Ahern <dsa@cumulusnetworks.com> | 2016-08-14 19:52:56 -0700 |
|---|---|---|
| committer |   Steffen Klassert <steffen.klassert@secunet.com> | 2016-08-22 06:33:32 +0200 |
| commit | 11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b (patch) | |
| tree | 3c650da684bb7b92723804fa8e90d883390ea1b5 /net/ipv4 | |
| parent | net/xfrm_input: fix possible NULL deref of tunnel.ip6->parms.i_key (diff) | |
| download | linux-dev-11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b.tar.xz linux-dev-11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b.zip | |
xfrm: Only add l3mdev oif to dst lookups
Subash reported that commit 42a7b32b73d6 ("xfrm: Add oif to dst lookups")
broke a wifi use case that uses fib rules and xfrms. The intent of
42a7b32b73d6 was driven by VRFs with IPsec. As a compromise relax the
use of oif in xfrm lookups to L3 master devices only (ie., oif is either
an L3 master device or is enslaved to a master device).
Fixes: 42a7b32b73d6 ("xfrm: Add oif to dst lookups")
Reported-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/xfrm4_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 7b0edb37a115..e07ed8b1deb3 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -29,7 +29,7 @@ static struct dst_entry *__xfrm4_dst_lookup(struct net *net, struct flowi4 *fl4, memset(fl4, 0, sizeof(*fl4)); fl4->daddr = daddr->a4; fl4->flowi4_tos = tos; - fl4->flowi4_oif = oif; + fl4->flowi4_oif = l3mdev_master_ifindex_by_index(net, oif); if (saddr) fl4->saddr = saddr->a4; |