Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 284fa7da authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns xfrm: state walking in netns 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5447c5e4

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ extern int xfrm_proc_init(void); 
#endif



extern void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto);

extern int xfrm_state_walk(struct xfrm_state_walk *walk,

extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,

			   int (*func)(struct xfrm_state *, int, void*), void *);

extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);

extern struct xfrm_state *xfrm_state_alloc(struct net *net);

net/key/af_key.c

+1 −1
Original line number Diff line number Diff line
@@ -1776,7 +1776,7 @@ static int dump_sa(struct xfrm_state *x, int count, void *ptr) 


static int pfkey_dump_sa(struct pfkey_sock *pfk)

{

	return xfrm_state_walk(&pfk->dump.u.state, dump_sa, (void *) pfk);

	return xfrm_state_walk(&init_net, &pfk->dump.u.state, dump_sa, (void *) pfk);

}



static void pfkey_dump_sa_done(struct pfkey_sock *pfk)

net/xfrm/xfrm_state.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

net/xfrm/xfrm_user.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}