smb: client: fix deadlock in smb2_find_smb_tcon()

PlaidCat · PlaidCat · commit 98a4a07d66a0 · 2024-12-11T18:06:17.000-05:00
jira LE-2157 Rebuild_History Non-Buildable kernel-5.14.0-503.14.1.el9_5 commit-author Enzo Matsumiya <ematsumiya@suse.de> commit 02c4187 Unlock cifs_tcp_ses_lock before calling cifs_put_smb_ses() to avoid such deadlock. Cc: stable@vger.kernel.org Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de> Reviewed-by: Shyam Prasad N <sprasad@microsoft.com> Reviewed-by: Paulo Alcantara (Red Hat) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com> (cherry picked from commit 02c4187) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
diff --git a/fs/smb/client/smb2transport.c b/fs/smb/client/smb2transport.c
@@ -214,8 +214,8 @@ smb2_find_smb_tcon(struct TCP_Server_Info *server, __u64 ses_id, __u32  tid)
 	}
 	tcon = smb2_find_smb_sess_tcon_unlocked(ses, tid);
 	if (!tcon) {
-		cifs_put_smb_ses(ses);
 		spin_unlock(&cifs_tcp_ses_lock);
+		cifs_put_smb_ses(ses);
 		return NULL;
 	}
 	spin_unlock(&cifs_tcp_ses_lock);

Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,8 @@ smb2_find_smb_tcon(struct TCP_Server_Info *server, __u64 ses_id, __u32 tid)`
`214`	`214`	`}`
`215`	`215`	`tcon = smb2_find_smb_sess_tcon_unlocked(ses, tid);`
`216`	`216`	`if (!tcon) {`
`217`		`- cifs_put_smb_ses(ses);`
`218`	`217`	`spin_unlock(&cifs_tcp_ses_lock);`
	`218`	`+ cifs_put_smb_ses(ses);`
`219`	`219`	`return NULL;`
`220`	`220`	`}`
`221`	`221`	`spin_unlock(&cifs_tcp_ses_lock);`