aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 20:21:45 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 20:21:45 -0500
commit0331b1f383e1fa4049f8e75cafeea8f006171c64 (patch)
tree69409ab7c17e1527ed063bb4f2eda440e2cb4ea2 /net/xfrm
parent50a30657fd7ee77a94a6bf0ad86eba7c37c3032e (diff)
netns xfrm: add struct xfrm_policy::xp_net
Again, to avoid complications with passing netns when not necessary. Again, ->xp_net is set-once field, once set it never changes. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_policy.c5
-rw-r--r--net/xfrm/xfrm_user.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index cf2bf3aa7ab4..3eccefae2c8a 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -228,13 +228,14 @@ expired:
228 * SPD calls. 228 * SPD calls.
229 */ 229 */
230 230
231struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp) 231struct xfrm_policy *xfrm_policy_alloc(struct net *net, gfp_t gfp)
232{ 232{
233 struct xfrm_policy *policy; 233 struct xfrm_policy *policy;
234 234
235 policy = kzalloc(sizeof(struct xfrm_policy), gfp); 235 policy = kzalloc(sizeof(struct xfrm_policy), gfp);
236 236
237 if (policy) { 237 if (policy) {
238 write_pnet(&policy->xp_net, net);
238 INIT_LIST_HEAD(&policy->walk.all); 239 INIT_LIST_HEAD(&policy->walk.all);
239 INIT_HLIST_NODE(&policy->bydst); 240 INIT_HLIST_NODE(&policy->bydst);
240 INIT_HLIST_NODE(&policy->byidx); 241 INIT_HLIST_NODE(&policy->byidx);
@@ -1153,7 +1154,7 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol)
1153 1154
1154static struct xfrm_policy *clone_policy(struct xfrm_policy *old, int dir) 1155static struct xfrm_policy *clone_policy(struct xfrm_policy *old, int dir)
1155{ 1156{
1156 struct xfrm_policy *newp = xfrm_policy_alloc(GFP_ATOMIC); 1157 struct xfrm_policy *newp = xfrm_policy_alloc(xp_net(old), GFP_ATOMIC);
1157 1158
1158 if (newp) { 1159 if (newp) {
1159 newp->selector = old->selector; 1160 newp->selector = old->selector;
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 65cdaa5c2280..765c01e784e9 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1080,7 +1080,7 @@ static void copy_to_user_policy(struct xfrm_policy *xp, struct xfrm_userpolicy_i
1080 1080
1081static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, struct nlattr **attrs, int *errp) 1081static struct xfrm_policy *xfrm_policy_construct(struct xfrm_userpolicy_info *p, struct nlattr **attrs, int *errp)
1082{ 1082{
1083 struct xfrm_policy *xp = xfrm_policy_alloc(GFP_KERNEL); 1083 struct xfrm_policy *xp = xfrm_policy_alloc(&init_net, GFP_KERNEL);
1084 int err; 1084 int err;
1085 1085
1086 if (!xp) { 1086 if (!xp) {
@@ -2291,7 +2291,7 @@ static struct xfrm_policy *xfrm_compile_policy(struct sock *sk, int opt,
2291 if (p->dir > XFRM_POLICY_OUT) 2291 if (p->dir > XFRM_POLICY_OUT)
2292 return NULL; 2292 return NULL;
2293 2293
2294 xp = xfrm_policy_alloc(GFP_KERNEL); 2294 xp = xfrm_policy_alloc(&init_net, GFP_KERNEL);
2295 if (xp == NULL) { 2295 if (xp == NULL) {
2296 *dir = -ENOBUFS; 2296 *dir = -ENOBUFS;
2297 return NULL; 2297 return NULL;