diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-06 15:09:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-06 15:09:16 +0200 |
| commit | 2e9550ed67cc861e6607d63e7d1036dce28f4902 (patch) | |
| tree | 644091635a2b0ae76499534c0c4ba6f293da6ea0 /net/xfrm/xfrm_policy.c | |
| parent | forcedeth: use per cpu to collect xmit/recv statistics (diff) | |
| parent | xfrm: policy: avoid warning splat when merging nodes (diff) | |
| download | linux-dev-2e9550ed67cc861e6607d63e7d1036dce28f4902.tar.xz linux-dev-2e9550ed67cc861e6607d63e7d1036dce28f4902.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2019-09-05
1) Several xfrm interface fixes from Nicolas Dichtel:
- Avoid an interface ID corruption on changelink.
- Fix wrong intterface names in the logs.
- Fix a list corruption when changing network namespaces.
- Fix unregistation of the underying phydev.
2) Fix a potential warning when merging xfrm_plocy nodes.
From Florian Westphal.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index ec94f5795ea4..21e939235b39 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -912,6 +912,7 @@ restart: } else if (delta > 0) { p = &parent->rb_right; } else { + bool same_prefixlen = node->prefixlen == n->prefixlen; struct xfrm_policy *tmp; hlist_for_each_entry(tmp, &n->hhead, bydst) { @@ -919,9 +920,11 @@ restart: hlist_del_rcu(&tmp->bydst); } + node->prefixlen = prefixlen; + xfrm_policy_inexact_list_reinsert(net, node, family); - if (node->prefixlen == n->prefixlen) { + if (same_prefixlen) { kfree_rcu(n, rcu); return; } @@ -929,7 +932,6 @@ restart: rb_erase(*p, new); kfree_rcu(n, rcu); n = node; - n->prefixlen = prefixlen; goto restart; } } |