This is a note to let you know that I've just added the patch titled
[PATCH stable 5.8 06/22] chelsio/chtls: fix deadlock issue
to the 5.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
chelsio-chtls-fix-deadlock-issue.patch
and it can be found in the queue-5.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Oct 31 09:06:02 AM CET 2020
From: Vinay Kumar Yadav <vinay.yadav@xxxxxxxxxxx>
Date: Mon, 26 Oct 2020 01:05:39 +0530
Subject: [PATCH stable 5.8 06/22] chelsio/chtls: fix deadlock issue
From: Vinay Kumar Yadav <vinay.yadav@xxxxxxxxxxx>
[ Upstream commit 28e9dcd9172028263c8225c15c4e329e08475e89 ]
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: cc35c88ae4db ("crypto : chtls - CPL handler definition")
Signed-off-by: Vinay Kumar Yadav <vinay.yadav@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20201025193538.31112-1-vinay.yadav@xxxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/crypto/chelsio/chtls/chtls_cm.c | 2 --
1 file changed, 2 deletions(-)
--- a/drivers/crypto/chelsio/chtls/chtls_cm.c
+++ b/drivers/crypto/chelsio/chtls/chtls_cm.c
@@ -1513,7 +1513,6 @@ static void add_to_reap_list(struct sock
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);
@@ -1522,7 +1521,6 @@ static void add_to_reap_list(struct sock
if (!csk->passive_reap_next)
schedule_work(&reap_task);
spin_unlock(&reap_list_lock);
- bh_unlock_sock(sk);
local_bh_enable();
}
Patches currently in stable-queue which might be from vinay.yadav@xxxxxxxxxxx are
queue-5.8/chelsio-chtls-fix-memory-leaks-in-cpl-handlers.patch
queue-5.8/chelsio-chtls-fix-deadlock-issue.patch
queue-5.8/chelsio-chtls-fix-tls-record-info-to-user.patch
