Commit 28e9dcd9 authored by Vinay Kumar Yadav's avatar Vinay Kumar Yadav Committed by Jakub Kicinski
Browse files

chelsio/chtls: fix deadlock issue 



In chtls_pass_establish() we hold child socket lock using bh_lock_sock
and we are again trying bh_lock_sock in add_to_reap_list, causing deadlock.
Remove bh_lock_sock in add_to_reap_list() as lock is already held.

Fixes: cc35c88a ("crypto : chtls - CPL handler definition")
Signed-off-by: default avatarVinay Kumar Yadav <vinay.yadav@chelsio.com>
Link: https://lore.kernel.org/r/20201025193538.31112-1-vinay.yadav@chelsio.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e3364c5f

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c

+0 −2
Original line number Diff line number Diff line
@@ -1514,7 +1514,6 @@ static void add_to_reap_list(struct sock *sk) 
	struct chtls_sock *csk = sk->sk_user_data;



	local_bh_disable();

	bh_lock_sock(sk);

	release_tcp_port(sk); /* release the port immediately */



	spin_lock(&reap_list_lock);
@@ -1523,7 +1522,6 @@ static void add_to_reap_list(struct sock *sk) 
	if (!csk->passive_reap_next)

		schedule_work(&reap_task);

	spin_unlock(&reap_list_lock);

	bh_unlock_sock(sk);

	local_bh_enable();

}