smb3: do not attempt cifs operation in smb3 query info error path

commit 1e77a8c204c9d1b655c61751b8ad0fde22421dbb upstream.

If backupuid mount option is sent, we can incorrectly retry
(on access denied on query info) with a cifs (FindFirst) operation
on an smb3 mount which causes the server to force the session close.

We set backup intent on open so no need for this fallback.

See kernel bugzilla 201435

Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index d279fa5472db80c5b99e0a16e3f034b4d2125765..334b2b3d21a36fd17b3c80a543b8113beac5ac91 100644 (file)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -779,7 +779,15 @@ cifs_get_inode_info(struct inode **inode, const char *full_path,
        } else if (rc == -EREMOTE) {
                cifs_create_dfs_fattr(&fattr, sb);
                rc = 0;
-       } else if (rc == -EACCES && backup_cred(cifs_sb)) {
+       } else if ((rc == -EACCES) && backup_cred(cifs_sb) &&
+                  (strcmp(server->vals->version_string, SMB1_VERSION_STRING)
+                     == 0)) {
+                       /*
+                        * For SMB2 and later the backup intent flag is already
+                        * sent if needed on open and there is no path based
+                        * FindFirst operation to use to retry with
+                        */
+
                        srchinf = kzalloc(sizeof(struct cifs_search_info),
                                                GFP_KERNEL);
                        if (srchinf == NULL) {