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

Commit 225f4005 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

ipsec: Restore larval states and socket policies in dump 



The commit commit 4c563f76 ("[XFRM]:
Speed up xfrm_policy and xfrm_state walking") inadvertently removed
larval states and socket policies from netlink dumps.  This patch
restores them.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd9ec7d3

net/xfrm/xfrm_policy.c

+1 −0
Original line number Diff line number Diff line
@@ -1077,6 +1077,7 @@ static void __xfrm_policy_link(struct xfrm_policy *pol, int dir) 
	struct hlist_head *chain = policy_hash_bysel(&pol->selector,

						     pol->family, dir);



	list_add_tail(&pol->bytype, &xfrm_policy_bytype[pol->type]);

	hlist_add_head(&pol->bydst, chain);

	hlist_add_head(&pol->byidx, xfrm_policy_byidx+idx_hash(pol->index));

	xfrm_policy_count[dir]++;

net/xfrm/xfrm_state.c

+2 −0
Original line number Diff line number Diff line
@@ -858,6 +858,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 


		if (km_query(x, tmpl, pol) == 0) {

			x->km.state = XFRM_STATE_ACQ;

			list_add_tail(&x->all, &xfrm_state_all);

			hlist_add_head(&x->bydst, xfrm_state_bydst+h);

			h = xfrm_src_hash(daddr, saddr, family);

			hlist_add_head(&x->bysrc, xfrm_state_bysrc+h);
@@ -1055,6 +1056,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re 
		xfrm_state_hold(x);

		x->timer.expires = jiffies + sysctl_xfrm_acq_expires*HZ;

		add_timer(&x->timer);

		list_add_tail(&x->all, &xfrm_state_all);

		hlist_add_head(&x->bydst, xfrm_state_bydst+h);

		h = xfrm_src_hash(daddr, saddr, family);

		hlist_add_head(&x->bysrc, xfrm_state_bysrc+h);