aboutsummaryrefslogtreecommitdiffstats
path: root/net/key
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/key
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/key')
-rw-r--r--net/key/af_key.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index f202ba6c8dcb..036315d6b665 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2174,7 +2174,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
2174 if (!pol->sadb_x_policy_dir || pol->sadb_x_policy_dir >= IPSEC_DIR_MAX) 2174 if (!pol->sadb_x_policy_dir || pol->sadb_x_policy_dir >= IPSEC_DIR_MAX)
2175 return -EINVAL; 2175 return -EINVAL;
2176 2176
2177 xp = xfrm_policy_alloc(GFP_KERNEL); 2177 xp = xfrm_policy_alloc(&init_net, GFP_KERNEL);
2178 if (xp == NULL) 2178 if (xp == NULL)
2179 return -ENOBUFS; 2179 return -ENOBUFS;
2180 2180
@@ -3141,7 +3141,7 @@ static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt,
3141 (!pol->sadb_x_policy_dir || pol->sadb_x_policy_dir > IPSEC_DIR_OUTBOUND)) 3141 (!pol->sadb_x_policy_dir || pol->sadb_x_policy_dir > IPSEC_DIR_OUTBOUND))
3142 return NULL; 3142 return NULL;
3143 3143
3144 xp = xfrm_policy_alloc(GFP_ATOMIC); 3144 xp = xfrm_policy_alloc(&init_net, GFP_ATOMIC);
3145 if (xp == NULL) { 3145 if (xp == NULL) {
3146 *dir = -ENOBUFS; 3146 *dir = -ENOBUFS;
3147 return NULL; 3147 return NULL;