diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-04 10:45:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-04 10:45:41 +0100 |
| commit | d00551b402015c519d19e1535bf2b5398854b0dd (patch) | |
| tree | e5a31383d45baba5d0c0b397f99a536f73b4f3d1 /include | |
| parent | ff0ee9dfe8a3277b1d2be3bb3e689a1cef01f13e (diff) | |
| parent | 480e93e12aa04d857f7cc2e6fcec181c0d690404 (diff) | |
| download | linux-stable-d00551b402015c519d19e1535bf2b5398854b0dd.tar.gz linux-stable-d00551b402015c519d19e1535bf2b5398854b0dd.tar.bz2 linux-stable-d00551b402015c519d19e1535bf2b5398854b0dd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2021-08-04
1) Fix a sysbot reported memory leak in xfrm_user_rcv_msg.
From Pavel Skripkin.
2) Revert "xfrm: policy: Read seqcount outside of rcu-read side
in xfrm_policy_lookup_bytype". This commit tried to fix a
lockin bug, but only cured some of the symptoms. A proper
fix is applied on top of this revert.
3) Fix a locking bug on xfrm state hash resize. A recent change
on sequence counters accidentally repaced a spinlock by a mutex.
Fix from Frederic Weisbecker.
4) Fix possible user-memory-access in xfrm_user_rcv_msg_compat().
From Dmitry Safonov.
5) Add initialiation sefltest fot xfrm_spdattr_type_t.
From Dmitry Safonov.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netns/xfrm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h index e946366e8ba5..1f4e1816fd36 100644 --- a/include/net/netns/xfrm.h +++ b/include/net/netns/xfrm.h @@ -75,6 +75,7 @@ struct netns_xfrm { #endif spinlock_t xfrm_state_lock; seqcount_spinlock_t xfrm_state_hash_generation; + seqcount_spinlock_t xfrm_policy_hash_generation; spinlock_t xfrm_policy_lock; struct mutex xfrm_cfg_mutex; |