diff options
| author | David S. Miller <davem@davemloft.net> | 2017-10-09 09:43:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-09 09:43:34 -0700 |
| commit | 93b03193c6a579dbe5e19139d1ab47b70dbeeebd (patch) | |
| tree | fafe769e2780bdc76bf815893cf07fd647f8389f /net/xfrm/xfrm_state.c | |
| parent | 6c0e7284d89995877740d8a26c3e99a937312a3c (diff) | |
| parent | dd269db84908d4d3f7c0efed85bf9d8939fb0b9b (diff) | |
| download | linux-93b03193c6a579dbe5e19139d1ab47b70dbeeebd.tar.gz linux-93b03193c6a579dbe5e19139d1ab47b70dbeeebd.tar.bz2 linux-93b03193c6a579dbe5e19139d1ab47b70dbeeebd.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2017-10-09
1) Fix some error paths of the IPsec offloading API.
2) Fix a NULL pointer dereference when IPsec is used
with vti. From Alexey Kodanev.
3) Don't call xfrm_policy_cache_flush under xfrm_state_lock,
it triggers several locking warnings. From Artem Savkov.
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_state.c')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 0dab1cd79ce4..12213477cd3a 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -732,12 +732,12 @@ restart: } } } +out: + spin_unlock_bh(&net->xfrm.xfrm_state_lock); if (cnt) { err = 0; xfrm_policy_cache_flush(); } -out: - spin_unlock_bh(&net->xfrm.xfrm_state_lock); return err; } EXPORT_SYMBOL(xfrm_state_flush); |