aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-25 20:50:36 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-25 20:50:36 -0500
commit7067802e262457a9737521e5669b622028b2283a (patch)
treef6f94b1429700979cb1407fc1f96de487f6bf085 /net/xfrm
parentfc34acd36eecdec95171b98ef2516e3d4daa5c41 (diff)
netns xfrm: pass netns with KM notifications
SA and SPD flush are executed with NULL SA and SPD respectively, for these cases pass netns explicitly from userspace socket. 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_user.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index ab8b138e5e2f..3e32ec2ea1ad 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1418,6 +1418,7 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
1418 c.event = nlh->nlmsg_type; 1418 c.event = nlh->nlmsg_type;
1419 c.seq = nlh->nlmsg_seq; 1419 c.seq = nlh->nlmsg_seq;
1420 c.pid = nlh->nlmsg_pid; 1420 c.pid = nlh->nlmsg_pid;
1421 c.net = net;
1421 km_state_notify(NULL, &c); 1422 km_state_notify(NULL, &c);
1422 1423
1423 return 0; 1424 return 0;
@@ -1569,6 +1570,7 @@ static int xfrm_flush_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
1569 c.event = nlh->nlmsg_type; 1570 c.event = nlh->nlmsg_type;
1570 c.seq = nlh->nlmsg_seq; 1571 c.seq = nlh->nlmsg_seq;
1571 c.pid = nlh->nlmsg_pid; 1572 c.pid = nlh->nlmsg_pid;
1573 c.net = net;
1572 km_policy_notify(NULL, 0, &c); 1574 km_policy_notify(NULL, 0, &c);
1573 return 0; 1575 return 0;
1574} 1576}
@@ -2084,7 +2086,7 @@ static int xfrm_aevent_state_notify(struct xfrm_state *x, struct km_event *c)
2084 2086
2085static int xfrm_notify_sa_flush(struct km_event *c) 2087static int xfrm_notify_sa_flush(struct km_event *c)
2086{ 2088{
2087 struct net *net = &init_net; 2089 struct net *net = c->net;
2088 struct xfrm_usersa_flush *p; 2090 struct xfrm_usersa_flush *p;
2089 struct nlmsghdr *nlh; 2091 struct nlmsghdr *nlh;
2090 struct sk_buff *skb; 2092 struct sk_buff *skb;
@@ -2446,7 +2448,7 @@ nlmsg_failure:
2446 2448
2447static int xfrm_notify_policy_flush(struct km_event *c) 2449static int xfrm_notify_policy_flush(struct km_event *c)
2448{ 2450{
2449 struct net *net = &init_net; 2451 struct net *net = c->net;
2450 struct nlmsghdr *nlh; 2452 struct nlmsghdr *nlh;
2451 struct sk_buff *skb; 2453 struct sk_buff *skb;
2452 2454