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

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

netns xfrm: propagate netns into policy byidx hash 



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

net/xfrm/xfrm_policy.c

+6 −6
Original line number Diff line number Diff line
@@ -321,9 +321,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) 


static unsigned int xfrm_policy_hashmax __read_mostly = 1 * 1024 * 1024;



static inline unsigned int idx_hash(u32 index)

static inline unsigned int idx_hash(struct net *net, u32 index)

{

	return __idx_hash(index, init_net.xfrm.policy_idx_hmask);

	return __idx_hash(index, net->xfrm.policy_idx_hmask);

}



static struct hlist_head *policy_hash_bysel(struct xfrm_selector *sel, unsigned short family, int dir)
@@ -523,7 +523,7 @@ static u32 xfrm_gen_index(int dir) 
		idx_generator += 8;

		if (idx == 0)

			idx = 8;

		list = init_net.xfrm.policy_byidx + idx_hash(idx);

		list = init_net.xfrm.policy_byidx + idx_hash(&init_net, idx);

		found = 0;

		hlist_for_each_entry(p, entry, list, byidx) {

			if (p->index == idx) {
@@ -596,7 +596,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) 
		init_net.xfrm.policy_count[dir]--;

	}

	policy->index = delpol ? delpol->index : xfrm_gen_index(dir);

	hlist_add_head(&policy->byidx, init_net.xfrm.policy_byidx+idx_hash(policy->index));

	hlist_add_head(&policy->byidx, init_net.xfrm.policy_byidx+idx_hash(&init_net, policy->index));

	policy->curlft.add_time = get_seconds();

	policy->curlft.use_time = 0;

	if (!mod_timer(&policy->timer, jiffies + HZ))
@@ -698,7 +698,7 @@ struct xfrm_policy *xfrm_policy_byid(u8 type, int dir, u32 id, int delete, 


	*err = 0;

	write_lock_bh(&xfrm_policy_lock);

	chain = init_net.xfrm.policy_byidx + idx_hash(id);

	chain = init_net.xfrm.policy_byidx + idx_hash(&init_net, id);

	ret = NULL;

	hlist_for_each_entry(pol, entry, chain, byidx) {

		if (pol->type == type && pol->index == id) {
@@ -1075,7 +1075,7 @@ static void __xfrm_policy_link(struct xfrm_policy *pol, int dir) 


	list_add(&pol->walk.all, &net->xfrm.policy_all);

	hlist_add_head(&pol->bydst, chain);

	hlist_add_head(&pol->byidx, net->xfrm.policy_byidx+idx_hash(pol->index));

	hlist_add_head(&pol->byidx, net->xfrm.policy_byidx+idx_hash(net, pol->index));

	net->xfrm.policy_count[dir]++;

	xfrm_pol_hold(pol);