diff options
| author |   Pavel Shilovsky <pshilov@microsoft.com> | 2019-07-22 11:34:59 -0700 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2019-08-05 22:49:54 -0500 |
| commit | e99c63e4d86d3a94818693147b469fa70de6f945 (patch) | |
| tree | 2328d27ed358c8b4c1cf0af0788d30382a7f6779 /fs/cifs/smb2pdu.c | |
| parent | cifs: fix rmmod regression in cifs.ko caused by force_sig changes (diff) | |
| download | linux-dev-e99c63e4d86d3a94818693147b469fa70de6f945.tar.xz linux-dev-e99c63e4d86d3a94818693147b469fa70de6f945.zip | |
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>
Diffstat (limited to 'fs/cifs/smb2pdu.c')
| -rw-r--r-- | fs/cifs/smb2pdu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index c8cd7b6cdda2..33efc5fb293c 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -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) { |