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

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

netns xfrm: xfrm_policy_check in netns 



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

include/net/xfrm.h

+2 −1
Original line number Diff line number Diff line
@@ -992,12 +992,13 @@ static inline int __xfrm_policy_check2(struct sock *sk, int dir, 
				       struct sk_buff *skb,

				       unsigned int family, int reverse)

{

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

	int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0);



	if (sk && sk->sk_policy[XFRM_POLICY_IN])

		return __xfrm_policy_check(sk, ndir, skb, family);



	return	(!init_net.xfrm.policy_count[dir] && !skb->sp) ||

	return	(!net->xfrm.policy_count[dir] && !skb->sp) ||

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

		__xfrm_policy_check(sk, ndir, skb, family);

}

net/xfrm/xfrm_policy.c

+3 −2
Original line number Diff line number Diff line
@@ -1894,6 +1894,7 @@ static inline int secpath_has_nontransport(struct sec_path *sp, int k, int *idxp 
int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,

			unsigned short family)

{

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

	struct xfrm_policy *pol;

	struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX];

	int npols = 0;
@@ -1938,7 +1939,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, 
	}



	if (!pol)

		pol = flow_cache_lookup(&init_net, &fl, family, fl_dir,

		pol = flow_cache_lookup(net, &fl, family, fl_dir,

					xfrm_policy_lookup);



	if (IS_ERR(pol)) {
@@ -1961,7 +1962,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, 
	npols ++;

#ifdef CONFIG_XFRM_SUB_POLICY

	if (pols[0]->type != XFRM_POLICY_TYPE_MAIN) {

		pols[1] = xfrm_policy_lookup_bytype(&init_net, XFRM_POLICY_TYPE_MAIN,

		pols[1] = xfrm_policy_lookup_bytype(net, XFRM_POLICY_TYPE_MAIN,

						    &fl, family,

						    XFRM_POLICY_IN);

		if (pols[1]) {