netns xfrm: state walking in netns

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 0d974fc9dd6..ea340bbbcc6 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1544,7 +1544,7 @@ unlock:
 }
 EXPORT_SYMBOL(xfrm_alloc_spi);
 
-int xfrm_state_walk(struct xfrm_state_walk *walk,
+int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
                     int (*func)(struct xfrm_state *, int, void*),
                     void *data)
 {
@@ -1557,10 +1557,10 @@ int xfrm_state_walk(struct xfrm_state_walk *walk,
 
         spin_lock_bh(&xfrm_state_lock);
         if (list_empty(&walk->all))
-                x = list_first_entry(&init_net.xfrm.state_all, struct xfrm_state_walk, all);
+                x = list_first_entry(&net->xfrm.state_all, struct xfrm_state_walk, all);
         else
                 x = list_entry(&walk->all, struct xfrm_state_walk, all);
-        list_for_each_entry_from(x, &init_net.xfrm.state_all, all) {
+        list_for_each_entry_from(x, &net->xfrm.state_all, all) {
                 if (x->state == XFRM_STATE_DEAD)
                         continue;
                 state = container_of(x, struct xfrm_state, km);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 3d577440b67..787b0ee6503 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -631,7 +631,7 @@ static int xfrm_dump_sa(struct sk_buff *skb, struct netlink_callback *cb)
                 xfrm_state_walk_init(walk, 0);
         }
 
-        (void) xfrm_state_walk(walk, dump_one_state, &info);
+        (void) xfrm_state_walk(&init_net, walk, dump_one_state, &info);
 
         return skb->len;
 }