OSDN Git Service

UPSTREAM: xfrm: Only add l3mdev oif to dst lookups
authorDavid Ahern <dsa@cumulusnetworks.com>
Mon, 15 Aug 2016 02:52:56 +0000 (19:52 -0700)
committerLorenzo Colitti <lorenzo@google.com>
Wed, 11 Oct 2017 06:18:26 +0000 (15:18 +0900)
commit511953dbd56f3a911e8bbf9aa0e4e067fe8d564e
tree9f106592f171381941f7ffbe0236ac2af6a3157f
parent93ea173930ba39aa67b320a3dab022665a8ca50f
UPSTREAM: 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).

[cherry-pick of upstream 11d7a0bb95eaaba1741bb24a7c3c169c82f09c7b]

Bug: 63589535
Change-Id: Ibadb15341f6c6c7077eccfaa2c66b3bb86b251bf
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>
net/ipv4/xfrm4_policy.c
net/ipv6/xfrm6_policy.c