diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:34:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:34:20 -0500 |
commit | 8d1211a6aaea43ea36151c17b0193eb763ff2d7e (patch) | |
tree | 8e58601a897ec0e2afb3b2b1df695560b0d76ed4 /net/key | |
parent | 33ffbbd52c327225a3e28485c39dc5746d81be03 (diff) |
netns xfrm: finding policy in netns
Add netns parameter to xfrm_policy_bysel_ctx(), xfrm_policy_byidx().
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 0f44856c1f1..ca268116ac1 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -2324,7 +2324,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg | |||
2324 | return err; | 2324 | return err; |
2325 | } | 2325 | } |
2326 | 2326 | ||
2327 | xp = xfrm_policy_bysel_ctx(XFRM_POLICY_TYPE_MAIN, | 2327 | xp = xfrm_policy_bysel_ctx(&init_net, XFRM_POLICY_TYPE_MAIN, |
2328 | pol->sadb_x_policy_dir - 1, &sel, pol_ctx, | 2328 | pol->sadb_x_policy_dir - 1, &sel, pol_ctx, |
2329 | 1, &err); | 2329 | 1, &err); |
2330 | security_xfrm_policy_free(pol_ctx); | 2330 | security_xfrm_policy_free(pol_ctx); |
@@ -2571,8 +2571,8 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h | |||
2571 | return -EINVAL; | 2571 | return -EINVAL; |
2572 | 2572 | ||
2573 | delete = (hdr->sadb_msg_type == SADB_X_SPDDELETE2); | 2573 | delete = (hdr->sadb_msg_type == SADB_X_SPDDELETE2); |
2574 | xp = xfrm_policy_byid(XFRM_POLICY_TYPE_MAIN, dir, pol->sadb_x_policy_id, | 2574 | xp = xfrm_policy_byid(&init_net, XFRM_POLICY_TYPE_MAIN, dir, |
2575 | delete, &err); | 2575 | pol->sadb_x_policy_id, delete, &err); |
2576 | if (xp == NULL) | 2576 | if (xp == NULL) |
2577 | return -ENOENT; | 2577 | return -ENOENT; |
2578 | 2578 | ||