Revert "xfrm: fix dflt policy check when there is no policy configured"
This reverts commit 57c1bbe709
which is
ec3bb890817e4398f2d46e12e2e205495b116be9 commit upstream.
It breaks the Android kernel ABI and if this really needs to be added to
Android, it must come back in a format in the future that does not break
the abi.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iebfe2659463646982cc41c7cd29db2d51ef5e6eb
This commit is contained in:
@@ -1170,7 +1170,7 @@ static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)
|
||||
{
|
||||
struct net *net = dev_net(skb->dev);
|
||||
|
||||
if (xfrm_default_allow(net, XFRM_POLICY_OUT))
|
||||
if (xfrm_default_allow(net, XFRM_POLICY_FWD))
|
||||
return !net->xfrm.policy_count[XFRM_POLICY_OUT] ||
|
||||
(skb_dst(skb)->flags & DST_NOXFRM) ||
|
||||
__xfrm_route_forward(skb, family);
|
||||
|
Reference in New Issue
Block a user