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

[PATCH 24/53] netns xfrm: state flush in netns

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

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
 include/net/xfrm.h    |    2 +-
 net/key/af_key.c      |    2 +-
 net/xfrm/xfrm_state.c |   18 +++++++++---------
 net/xfrm/xfrm_user.c  |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 8699620..e4bb672 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1363,7 +1363,7 @@ struct xfrmk_spdinfo {
 
 extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);
 extern int xfrm_state_delete(struct xfrm_state *x);
-extern int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info);
+extern int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info);
 extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);
 extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si);
 extern int xfrm_replay_check(struct xfrm_state *x,
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 036315d..e5d595a 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1732,7 +1732,7 @@ static int pfkey_flush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hd
 	audit_info.loginuid = audit_get_loginuid(current);
 	audit_info.sessionid = audit_get_sessionid(current);
 	audit_info.secid = 0;
-	err = xfrm_state_flush(proto, &audit_info);
+	err = xfrm_state_flush(&init_net, proto, &audit_info);
 	if (err)
 		return err;
 	c.data.proto = proto;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index f3f635d..5f4c534 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -576,15 +576,15 @@ EXPORT_SYMBOL(xfrm_state_delete);
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 static inline int
-xfrm_state_flush_secctx_check(u8 proto, struct xfrm_audit *audit_info)
+xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audit_info)
 {
 	int i, err = 0;
 
-	for (i = 0; i <= init_net.xfrm.state_hmask; i++) {
+	for (i = 0; i <= net->xfrm.state_hmask; i++) {
 		struct hlist_node *entry;
 		struct xfrm_state *x;
 
-		hlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+i, bydst) {
+		hlist_for_each_entry(x, entry, net->xfrm.state_bydst+i, bydst) {
 			if (xfrm_id_proto_match(x->id.proto, proto) &&
 			   (err = security_xfrm_state_delete(x)) != 0) {
 				xfrm_audit_state_delete(x, 0,
@@ -600,26 +600,26 @@ xfrm_state_flush_secctx_check(u8 proto, struct xfrm_audit *audit_info)
 }
 #else
 static inline int
-xfrm_state_flush_secctx_check(u8 proto, struct xfrm_audit *audit_info)
+xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audit_info)
 {
 	return 0;
 }
 #endif
 
-int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info)
+int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info)
 {
 	int i, err = 0;
 
 	spin_lock_bh(&xfrm_state_lock);
-	err = xfrm_state_flush_secctx_check(proto, audit_info);
+	err = xfrm_state_flush_secctx_check(net, proto, audit_info);
 	if (err)
 		goto out;
 
-	for (i = 0; i <= init_net.xfrm.state_hmask; i++) {
+	for (i = 0; i <= net->xfrm.state_hmask; i++) {
 		struct hlist_node *entry;
 		struct xfrm_state *x;
 restart:
-		hlist_for_each_entry(x, entry, init_net.xfrm.state_bydst+i, bydst) {
+		hlist_for_each_entry(x, entry, net->xfrm.state_bydst+i, bydst) {
 			if (!xfrm_state_kern(x) &&
 			    xfrm_id_proto_match(x->id.proto, proto)) {
 				xfrm_state_hold(x);
@@ -641,7 +641,7 @@ restart:
 
 out:
 	spin_unlock_bh(&xfrm_state_lock);
-	wake_up(&init_net.xfrm.km_waitq);
+	wake_up(&net->xfrm.km_waitq);
 	return err;
 }
 EXPORT_SYMBOL(xfrm_state_flush);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 765c01e..49a7e89 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1398,7 +1398,7 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
 	audit_info.loginuid = NETLINK_CB(skb).loginuid;
 	audit_info.sessionid = NETLINK_CB(skb).sessionid;
 	audit_info.secid = NETLINK_CB(skb).sid;
-	err = xfrm_state_flush(p->proto, &audit_info);
+	err = xfrm_state_flush(&init_net, p->proto, &audit_info);
 	if (err)
 		return err;
 	c.data.proto = p->proto;
-- 
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)