crypto: af_alg - Use bh_lock_sock in sk_destruct

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: [email protected] Reported-by: Eric Dumazet <[email protected]> Fixes: c840ac6 ("crypto: af_alg - Disallow bind/setkey/...") Cc: <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
wafgo · Dec 11, 2019 · 37f9669 · 37f9669
1 parent bfcdcef
commit 37f9669
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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);