aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_user.c
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 20:34:20 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 20:34:20 -0500
commit8d1211a6aaea43ea36151c17b0193eb763ff2d7e (patch)
tree8e58601a897ec0e2afb3b2b1df695560b0d76ed4 /net/xfrm/xfrm_user.c
parent33ffbbd52c327225a3e28485c39dc5746d81be03 (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/xfrm/xfrm_user.c')
-rw-r--r--net/xfrm/xfrm_user.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index d4983e831c34..efd6ab5c0aca 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1330,7 +1330,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
1330 return err; 1330 return err;
1331 1331
1332 if (p->index) 1332 if (p->index)
1333 xp = xfrm_policy_byid(type, p->dir, p->index, delete, &err); 1333 xp = xfrm_policy_byid(&init_net, type, p->dir, p->index, delete, &err);
1334 else { 1334 else {
1335 struct nlattr *rt = attrs[XFRMA_SEC_CTX]; 1335 struct nlattr *rt = attrs[XFRMA_SEC_CTX];
1336 struct xfrm_sec_ctx *ctx; 1336 struct xfrm_sec_ctx *ctx;
@@ -1347,7 +1347,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
1347 if (err) 1347 if (err)
1348 return err; 1348 return err;
1349 } 1349 }
1350 xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, 1350 xp = xfrm_policy_bysel_ctx(&init_net, type, p->dir, &p->sel, ctx,
1351 delete, &err); 1351 delete, &err);
1352 security_xfrm_policy_free(ctx); 1352 security_xfrm_policy_free(ctx);
1353 } 1353 }
@@ -1571,7 +1571,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
1571 return err; 1571 return err;
1572 1572
1573 if (p->index) 1573 if (p->index)
1574 xp = xfrm_policy_byid(type, p->dir, p->index, 0, &err); 1574 xp = xfrm_policy_byid(&init_net, type, p->dir, p->index, 0, &err);
1575 else { 1575 else {
1576 struct nlattr *rt = attrs[XFRMA_SEC_CTX]; 1576 struct nlattr *rt = attrs[XFRMA_SEC_CTX];
1577 struct xfrm_sec_ctx *ctx; 1577 struct xfrm_sec_ctx *ctx;
@@ -1588,7 +1588,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
1588 if (err) 1588 if (err)
1589 return err; 1589 return err;
1590 } 1590 }
1591 xp = xfrm_policy_bysel_ctx(type, p->dir, &p->sel, ctx, 0, &err); 1591 xp = xfrm_policy_bysel_ctx(&init_net, type, p->dir, &p->sel, ctx, 0, &err);
1592 security_xfrm_policy_free(ctx); 1592 security_xfrm_policy_free(ctx);
1593 } 1593 }
1594 if (xp == NULL) 1594 if (xp == NULL)