Home » Mailing list archives » linux-netdev » 2008 » November » 25

[PATCH 35/53] netns xfrm: xfrm_policy_check in netns

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Alexey Dobriyan
Subject: [PATCH 35/53] netns xfrm: xfrm_policy_check in netns
Date: Tuesday, November 25, 2008 - 10:27 am

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
 include/net/xfrm.h     |    3 ++-
 net/xfrm/xfrm_policy.c |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 1dc4ff0..158848f 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -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);
 }
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 7c88a25..8097c99 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -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]) {
-- 
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 01/53] xfrm: initialise xfrm_policy_gc_work statically, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 02/53] netns xfrm: add netns boilerplate, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 04/53] netns xfrm: per-netns xfrm_state_all list, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 05/53] netns xfrm: per-netns xfrm_state_bydst hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 07/53] netns xfrm: per-netns xfrm_state_byspi hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 08/53] netns xfrm: per-netns xfrm_state_hmask, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 09/53] netns xfrm: per-netns xfrm_state counts, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 10/53] netns xfrm: per-netns xfrm_hash_work, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 11/53] netns xfrm: per-netns state GC list, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 12/53] netns xfrm: per-netns state GC work, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 13/53] netns xfrm: per-netns km_waitq, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 14/53] netns xfrm: add struct xfrm_policy::xp_net, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 15/53] netns xfrm: per-netns policy list, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 16/53] netns xfrm: per-netns xfrm_policy_byidx hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 17/53] netns xfrm: per-netns xfrm_policy_byidx hashmask, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 18/53] netns xfrm: per-netns inexact policies, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 19/53] netns xfrm: per-netns xfrm_policy_bydst hash, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 20/53] netns xfrm: per-netns policy counts, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 21/53] netns xfrm: per-netns policy hash resizing work, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 22/53] netns xfrm: propagate netns into bydst/bysrc ..., Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 23/53] netns xfrm: trivial netns propagations, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 24/53] netns xfrm: state flush in netns, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 25/53] netns xfrm: state lookup in netns, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 26/53] netns xfrm: fixup xfrm_alloc_spi(), Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 27/53] netns xfrm: finding states in netns, Alexey Dobriyan, (Tue Nov 25, 10:26 am)
[PATCH 28/53] netns xfrm: state walking in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 29/53] netns xfrm: propagate netns into policy byid ..., Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 30/53] netns xfrm: policy insertion in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 31/53] netns xfrm: policy flushing in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 32/53] netns xfrm: finding policy in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 33/53] netns xfrm: policy walking in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 34/53] netns xfrm: lookup in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 35/53] netns xfrm: xfrm_policy_check in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 36/53] netns xfrm: xfrm_route_forward() in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 37/53] netns xfrm: flushing/pruning bundles in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 38/53] netns xfrm: dst garbage-collecting in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 39/53] netns xfrm: xfrm_input() fixup, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 40/53] netns xfrm: per-netns NETLINK_XFRM socket, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 41/53] netns xfrm: xfrm_user module in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 42/53] netns xfrm: pass netns with KM notifications, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 43/53] netns xfrm: KM reporting in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 44/53] netns xfrm: -&gt;dst_lookup in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 45/53] netns xfrm: -&gt;get_saddr in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 46/53] netns xfrm: flush SA/SPDs on netns stop, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 47/53] netns PF_KEY: part 1, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 48/53] netns PF_KEY: part 2, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 49/53] netns PF_KEY: per-netns /proc/pfkey, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 50/53] netns xfrm: AH/ESP in netns!, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 51/53] netns xfrm: per-netns MIBs, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 52/53] netns xfrm: /proc/net/xfrm_stat in netns, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
[PATCH 53/53] netns xfrm: per-netns sysctls, Alexey Dobriyan, (Tue Nov 25, 10:27 am)
Re: [PATCH 01/53] xfrm: initialise xfrm_policy_gc_work sta ..., David Miller, (Tue Nov 25, 6:14 pm)
Re: [PATCH 02/53] netns xfrm: add netns boilerplate, David Miller, (Tue Nov 25, 6:14 pm)
Re: [PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net, David Miller, (Tue Nov 25, 6:15 pm)
Re: [PATCH 04/53] netns xfrm: per-netns xfrm_state_all list, David Miller, (Tue Nov 25, 6:16 pm)
Re: [PATCH 05/53] netns xfrm: per-netns xfrm_state_bydst hash, David Miller, (Tue Nov 25, 6:17 pm)
Re: [PATCH 06/53] netns xfrm: per-netns xfrm_state_bysrc hash, David Miller, (Tue Nov 25, 6:17 pm)
Re: [PATCH 07/53] netns xfrm: per-netns xfrm_state_byspi hash, David Miller, (Tue Nov 25, 6:17 pm)
Re: [PATCH 08/53] netns xfrm: per-netns xfrm_state_hmask, David Miller, (Tue Nov 25, 6:18 pm)
Re: [PATCH 09/53] netns xfrm: per-netns xfrm_state counts, David Miller, (Tue Nov 25, 6:18 pm)
Re: [PATCH 10/53] netns xfrm: per-netns xfrm_hash_work, David Miller, (Tue Nov 25, 6:19 pm)
Re: [PATCH 11/53] netns xfrm: per-netns state GC list, David Miller, (Tue Nov 25, 6:20 pm)
Re: [PATCH 12/53] netns xfrm: per-netns state GC work, David Miller, (Tue Nov 25, 6:20 pm)
Re: [PATCH 13/53] netns xfrm: per-netns km_waitq, David Miller, (Tue Nov 25, 6:21 pm)
Re: [PATCH 14/53] netns xfrm: add struct xfrm_policy::xp_net, David Miller, (Tue Nov 25, 6:21 pm)
Re: [PATCH 15/53] netns xfrm: per-netns policy list, David Miller, (Tue Nov 25, 6:22 pm)
Re: [PATCH 16/53] netns xfrm: per-netns xfrm_policy_byidx hash, David Miller, (Tue Nov 25, 6:22 pm)
Re: [PATCH 17/53] netns xfrm: per-netns xfrm_policy_byidx ..., David Miller, (Tue Nov 25, 6:23 pm)
Re: [PATCH 18/53] netns xfrm: per-netns inexact policies, David Miller, (Tue Nov 25, 6:23 pm)
Re: [PATCH 19/53] netns xfrm: per-netns xfrm_policy_bydst hash, David Miller, (Tue Nov 25, 6:23 pm)
Re: [PATCH 20/53] netns xfrm: per-netns policy counts, David Miller, (Tue Nov 25, 6:24 pm)
Re: [PATCH 21/53] netns xfrm: per-netns policy hash resizi ..., David Miller, (Tue Nov 25, 6:29 pm)
Re: [PATCH 22/53] netns xfrm: propagate netns into bydst/b ..., David Miller, (Tue Nov 25, 6:29 pm)
Re: [PATCH 23/53] netns xfrm: trivial netns propagations, David Miller, (Tue Nov 25, 6:29 pm)
Re: [PATCH 24/53] netns xfrm: state flush in netns, David Miller, (Tue Nov 25, 6:30 pm)
Re: [PATCH 25/53] netns xfrm: state lookup in netns, David Miller, (Tue Nov 25, 6:30 pm)
Re: [PATCH 26/53] netns xfrm: fixup xfrm_alloc_spi(), David Miller, (Tue Nov 25, 6:31 pm)
Re: [PATCH 27/53] netns xfrm: finding states in netns, David Miller, (Tue Nov 25, 6:31 pm)
Re: [PATCH 28/53] netns xfrm: state walking in netns, David Miller, (Tue Nov 25, 6:32 pm)
Re: [PATCH 29/53] netns xfrm: propagate netns into policy ..., David Miller, (Tue Nov 25, 6:32 pm)
Re: [PATCH 30/53] netns xfrm: policy insertion in netns, David Miller, (Tue Nov 25, 6:33 pm)
Re: [PATCH 31/53] netns xfrm: policy flushing in netns, David Miller, (Tue Nov 25, 6:33 pm)
Re: [PATCH 32/53] netns xfrm: finding policy in netns, David Miller, (Tue Nov 25, 6:34 pm)
Re: [PATCH 33/53] netns xfrm: policy walking in netns, David Miller, (Tue Nov 25, 6:34 pm)
Re: [PATCH 34/53] netns xfrm: lookup in netns, David Miller, (Tue Nov 25, 6:35 pm)
Re: [PATCH 35/53] netns xfrm: xfrm_policy_check in netns, David Miller, (Tue Nov 25, 6:35 pm)
Re: [PATCH 36/53] netns xfrm: xfrm_route_forward() in netns, David Miller, (Tue Nov 25, 6:36 pm)
Re: [PATCH 37/53] netns xfrm: flushing/pruning bundles in ..., David Miller, (Tue Nov 25, 6:36 pm)
Re: [PATCH 38/53] netns xfrm: dst garbage-collecting in netns, David Miller, (Tue Nov 25, 6:37 pm)
Re: [PATCH 39/53] netns xfrm: xfrm_input() fixup, David Miller, (Tue Nov 25, 6:38 pm)
Re: [PATCH 40/53] netns xfrm: per-netns NETLINK_XFRM socket, David Miller, (Tue Nov 25, 6:38 pm)
Re: [PATCH 41/53] netns xfrm: xfrm_user module in netns, David Miller, (Tue Nov 25, 6:50 pm)
Re: [PATCH 42/53] netns xfrm: pass netns with KM notifications, David Miller, (Tue Nov 25, 6:50 pm)
Re: [PATCH 43/53] netns xfrm: KM reporting in netns, David Miller, (Tue Nov 25, 6:51 pm)
Re: [PATCH 44/53] netns xfrm: -&gt;dst_lookup in netns, David Miller, (Tue Nov 25, 6:51 pm)
Re: [PATCH 45/53] netns xfrm: -&gt;get_saddr in netns, David Miller, (Tue Nov 25, 6:56 pm)
Re: [PATCH 46/53] netns xfrm: flush SA/SPDs on netns stop, David Miller, (Tue Nov 25, 6:57 pm)
Re: [PATCH 47/53] netns PF_KEY: part 1, David Miller, (Tue Nov 25, 6:58 pm)
Re: [PATCH 48/53] netns PF_KEY: part 2, David Miller, (Tue Nov 25, 6:58 pm)
Re: [PATCH 49/53] netns PF_KEY: per-netns /proc/pfkey, David Miller, (Tue Nov 25, 6:59 pm)
Re: [PATCH 50/53] netns xfrm: AH/ESP in netns!, David Miller, (Tue Nov 25, 6:59 pm)
Re: [PATCH 51/53] netns xfrm: per-netns MIBs, David Miller, (Tue Nov 25, 6:59 pm)
Re: [PATCH 52/53] netns xfrm: /proc/net/xfrm_stat in netns, David Miller, (Tue Nov 25, 7:00 pm)
Re: [PATCH 53/53] netns xfrm: per-netns sysctls, David Miller, (Tue Nov 25, 7:00 pm)
Re: [PATCH 03/53] netns xfrm: add struct xfrm_state::xs_net, Alexey Dobriyan, (Tue Nov 25, 9:25 pm)