Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a66657 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: xfrm_route_forward() in netns 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6e1e25d

include/net/xfrm.h

+3 −1
Original line number Diff line number Diff line
@@ -1050,7 +1050,9 @@ extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family); 


static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)

{

	return	!init_net.xfrm.policy_count[XFRM_POLICY_OUT] ||

	struct net *net = dev_net(skb->dev);



	return	!net->xfrm.policy_count[XFRM_POLICY_OUT] ||

		(skb->dst->flags & DST_NOXFRM) ||

		__xfrm_route_forward(skb, family);

}

net/xfrm/xfrm_policy.c

+2 −1
Original line number Diff line number Diff line
@@ -2044,6 +2044,7 @@ EXPORT_SYMBOL(__xfrm_policy_check); 


int __xfrm_route_forward(struct sk_buff *skb, unsigned short family)

{

	struct net *net = dev_net(skb->dev);

	struct flowi fl;



	if (xfrm_decode_session(skb, &fl, family) < 0) {
@@ -2052,7 +2053,7 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family) 
		return 0;

	}



	return xfrm_lookup(&init_net, &skb->dst, &fl, NULL, 0) == 0;

	return xfrm_lookup(net, &skb->dst, &fl, NULL, 0) == 0;

}

EXPORT_SYMBOL(__xfrm_route_forward);