This is a note to let you know that I've just added the patch titled
smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
to the 6.1-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:
smb3-fix-lock-ordering-potential-deadlock-in-cifs_sync_mid_result.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8861fd5180476f45f9e8853db154600469a0284f Mon Sep 17 00:00:00 2001
From: Steve French <stfrench@xxxxxxxxxxxxx>
Date: Thu, 25 Apr 2024 12:49:50 -0500
Subject: smb3: fix lock ordering potential deadlock in cifs_sync_mid_result
From: Steve French <stfrench@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
Reviewed-by: Shyam Prasad N <sprasad@xxxxxxxxxxxxx>
Signed-off-by: Steve French <stfrench@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/smb/client/transport.c | 3 +++
1 file changed, 3 insertions(+)
--- a/fs/smb/client/transport.c
+++ b/fs/smb/client/transport.c
@@ -931,12 +931,15 @@ cifs_sync_mid_result(struct mid_q_entry
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;
}
Patches currently in stable-queue which might be from stfrench@xxxxxxxxxxxxx are
queue-6.1/smb3-fix-lock-ordering-potential-deadlock-in-cifs_sync_mid_result.patch
queue-6.1/cifs-replace-remaining-1-element-arrays.patch
queue-6.1/smb-client-fix-struct_group-usage-in-__packed-structs.patch
queue-6.1/cifs-reinstate-original-behavior-again-for-forceuid-.patch
queue-6.1/smb-client-fix-rename-2-regression-against-samba.patch
