diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2019-12-05 13:45:05 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-01 09:34:52 +0000 |
| commit | 902c0f9a2851d44a8c6ccf5887b55e86ca220ed6 (patch) | |
| tree | 4968a6b80ab170e7922b097f20de6885df596263 | |
| parent | d9dea35fc6e45df4871717cfdff43ba196f7ce95 (diff) | |
| download | linux-crypto-902c0f9a2851d44a8c6ccf5887b55e86ca220ed6.tar.gz linux-crypto-902c0f9a2851d44a8c6ccf5887b55e86ca220ed6.zip | |
crypto: af_alg - Use bh_lock_sock in sk_destruct
commit a2ce15b668c6001804d34080c79e5e3c9979eda7 upstream.
As af_alg_release_parent may be called from BH context (most notably
due to an async request that only completes after socket closure,
or as reported here because of an RCU-delayed sk_destruct call), we
must use bh_lock_sock instead of lock_sock.
Reported-by: syzbot+c2f1558d49e25cc36e5e@syzkaller.appspotmail.com
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Fixes: 796caacfda1c ("crypto: af_alg - Disallow bind/setkey/...")
Cc: <stable@vger.kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/af_alg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index 0dceaabc..3d8e5301 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -134,11 +134,13 @@ void af_alg_release_parent(struct sock *sk) sk = ask->parent; ask = alg_sk(sk); - lock_sock(sk); + local_bh_disable(); + bh_lock_sock(sk); ask->nokey_refcnt -= nokey; if (!last) last = !--ask->refcnt; - release_sock(sk); + bh_unlock_sock(sk); + local_bh_enable(); if (last) sock_put(sk); |