| From foo@baz Sat Nov 10 11:24:34 PST 2018 |
| From: Florian Westphal <fw@strlen.de> |
| Date: Wed, 10 Oct 2018 18:02:21 +0200 |
| Subject: xfrm: policy: use hlist rcu variants on insert |
| |
| From: Florian Westphal <fw@strlen.de> |
| |
| [ Upstream commit 9dffff200fd178f11dd50eb1fd8ccd0650c9284e ] |
| |
| bydst table/list lookups use rcu, so insertions must use rcu versions. |
| |
| Fixes: a7c44247f704e ("xfrm: policy: make xfrm_policy_lookup_bytype lockless") |
| Signed-off-by: Florian Westphal <fw@strlen.de> |
| Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/xfrm/xfrm_policy.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/net/xfrm/xfrm_policy.c |
| +++ b/net/xfrm/xfrm_policy.c |
| @@ -659,9 +659,9 @@ static void xfrm_hash_rebuild(struct wor |
| break; |
| } |
| if (newpos) |
| - hlist_add_behind(&policy->bydst, newpos); |
| + hlist_add_behind_rcu(&policy->bydst, newpos); |
| else |
| - hlist_add_head(&policy->bydst, chain); |
| + hlist_add_head_rcu(&policy->bydst, chain); |
| } |
| |
| spin_unlock_bh(&net->xfrm.xfrm_policy_lock); |
| @@ -800,9 +800,9 @@ int xfrm_policy_insert(int dir, struct x |
| break; |
| } |
| if (newpos) |
| - hlist_add_behind(&policy->bydst, newpos); |
| + hlist_add_behind_rcu(&policy->bydst, newpos); |
| else |
| - hlist_add_head(&policy->bydst, chain); |
| + hlist_add_head_rcu(&policy->bydst, chain); |
| __xfrm_policy_link(policy, dir); |
| atomic_inc(&net->xfrm.flow_cache_genid); |
| |
