diff options
author | Steve French <stfrench@microsoft.com> | 2024-04-25 12:49:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-02 16:35:27 +0200 |
commit | 8248224ab5b8ca7559b671917c224296a4d671fc (patch) | |
tree | 1688c41bafab60733d225dcd0b0b447351085ae1 | |
parent | 60ab245292280905603bc0d3654f4cf8fceccb00 (diff) | |
download | linux-stable-8248224ab5b8ca7559b671917c224296a4d671fc.tar.gz linux-stable-8248224ab5b8ca7559b671917c224296a4d671fc.tar.bz2 linux-stable-8248224ab5b8ca7559b671917c224296a4d671fc.zip |
smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
commit 8861fd5180476f45f9e8853db154600469a0284f upstream.
Coverity spotted that the cifs_sync_mid_result function could deadlock
"Thread deadlock (ORDER_REVERSAL) lock_order: Calling spin_lock acquires
lock TCP_Server_Info.srv_lock while holding lock TCP_Server_Info.mid_lock"
Addresses-Coverity: 1590401 ("Thread deadlock (ORDER_REVERSAL)")
Cc: stable@vger.kernel.org
Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/smb/client/transport.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/smb/client/transport.c b/fs/smb/client/transport.c index e1a79e031b28..ddf1a3aafee5 100644 --- a/fs/smb/client/transport.c +++ b/fs/smb/client/transport.c @@ -909,12 +909,15 @@ cifs_sync_mid_result(struct mid_q_entry *mid, struct TCP_Server_Info *server) list_del_init(&mid->qhead); mid->mid_flags |= MID_DELETED; } + spin_unlock(&server->mid_lock); cifs_server_dbg(VFS, "%s: invalid mid state mid=%llu state=%d\n", __func__, mid->mid, mid->mid_state); rc = -EIO; + goto sync_mid_done; } spin_unlock(&server->mid_lock); +sync_mid_done: release_mid(mid); return rc; } |