Commit e99c63e4 authored Jul 22, 2019 by Pavel Shilovsky Committed by Steve French Aug 05, 2019

SMB3: Fix deadlock in validate negotiate hits reconnect



Currently we skip SMB2_TREE_CONNECT command when checking during
reconnect because Tree Connect happens when establishing
an SMB session. For SMB 3.0 protocol version the code also calls
validate negotiate which results in SMB2_IOCL command being sent
over the wire. This may deadlock on trying to acquire a mutex when
checking for reconnect. Fix this by skipping SMB2_IOCL command
when doing the reconnect check.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
CC: Stable <stable@vger.kernel.org>

parent 247bc947

fs/cifs/smb2pdu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -252,7 +252,7 @@ smb2_reconnect(__le16 smb2_command, struct cifs_tcon *tcon)
		if (tcon == NULL)
		return 0;

		if (smb2_command == SMB2_TREE_CONNECT)
		if (smb2_command == SMB2_TREE_CONNECT \|\| smb2_command == SMB2_IOCTL)
		return 0;

		if (tcon->tidStatus == CifsExiting) {

Admin message