6 files changed, 40 insertions, 19 deletions

diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index b380e0871372..a2b2355e7f01 100644
--- a/fs/cifs/cifs_unicode.c
+++ b/fs/cifs/cifs_unicode.c
@@ -105,9 +105,6 @@ convert_sfm_char(const __u16 src_char, char *target)
         case SFM_LESSTHAN:
                 *target = '<';
                 break;
-        case SFM_SLASH:
-                *target = '\\';
-                break;
         case SFM_SPACE:
                 *target = ' ';
                 break;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index c832a8a1970a..7aa08dba4719 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2547,7 +2547,7 @@ cifs_setup_ipc(struct cifs_ses *ses, struct smb_vol *volume_info)
         if (tcon == NULL)
                 return -ENOMEM;
 
-        snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->serverName);
+        snprintf(unc, sizeof(unc), "\\\\%s\\IPC$", ses->server->hostname);
 
         /* cannot fail */
         nls_codepage = load_nls_default();
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index d32eaa4b2437..6e8765f44508 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -467,6 +467,8 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path,
         oparms.cifs_sb = cifs_sb;
         oparms.desired_access = GENERIC_READ;
         oparms.create_options = CREATE_NOT_DIR;
+        if (backup_cred(cifs_sb))
+                oparms.create_options |= CREATE_OPEN_BACKUP_INTENT;
         oparms.disposition = FILE_OPEN;
         oparms.path = path;
         oparms.fid = &fid;
diff --git a/fs/cifs/smb2misc.c b/fs/cifs/smb2misc.c
index db0453660ff6..6a9c47541c53 100644
--- a/fs/cifs/smb2misc.c
+++ b/fs/cifs/smb2misc.c
@@ -248,16 +248,20 @@ smb2_check_message(char *buf, unsigned int len, struct TCP_Server_Info *srvr)
                  * MacOS server pads after SMB2.1 write response with 3 bytes
                  * of junk. Other servers match RFC1001 len to actual
                  * SMB2/SMB3 frame length (header + smb2 response specific data)
-                 * Some windows servers do too when compounding is used.
-                 * Log the server error (once), but allow it and continue
+                 * Some windows servers also pad up to 8 bytes when compounding.
+                 * If pad is longer than eight bytes, log the server behavior
+                 * (once), since may indicate a problem but allow it and continue
                  * since the frame is parseable.
                  */
                 if (clc_len < len) {
-                        printk_once(KERN_WARNING
-                                "SMB2 server sent bad RFC1001 len %d not %d\n",
-                                len, clc_len);
+                        pr_warn_once(
+                             "srv rsp padded more than expected. Length %d not %d for cmd:%d mid:%llu\n",
+                             len, clc_len, command, mid);
                         return 0;
                 }
+                pr_warn_once(
+                        "srv rsp too short, len %d not %d. cmd:%d mid:%llu\n",
+                        len, clc_len, command, mid);
 
                 return 1;
         }
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 247a98e6c856..d954ce36b473 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -630,7 +630,10 @@ smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon,
         oparms.tcon = tcon;
         oparms.desired_access = FILE_READ_ATTRIBUTES;
         oparms.disposition = FILE_OPEN;
-        oparms.create_options = 0;
+        if (backup_cred(cifs_sb))
+                oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
+        else
+                oparms.create_options = 0;
         oparms.fid = &fid;
         oparms.reconnect = false;
 
@@ -779,7 +782,10 @@ smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon,
         oparms.tcon = tcon;
         oparms.desired_access = FILE_READ_EA;
         oparms.disposition = FILE_OPEN;
-        oparms.create_options = 0;
+        if (backup_cred(cifs_sb))
+                oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
+        else
+                oparms.create_options = 0;
         oparms.fid = &fid;
         oparms.reconnect = false;
 
@@ -858,7 +864,10 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
         oparms.tcon = tcon;
         oparms.desired_access = FILE_WRITE_EA;
         oparms.disposition = FILE_OPEN;
-        oparms.create_options = 0;
+        if (backup_cred(cifs_sb))
+                oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
+        else
+                oparms.create_options = 0;
         oparms.fid = &fid;
         oparms.reconnect = false;
 
@@ -1453,7 +1462,10 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
         oparms.tcon = tcon;
         oparms.desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
         oparms.disposition = FILE_OPEN;
-        oparms.create_options = 0;
+        if (backup_cred(cifs_sb))
+                oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
+        else
+                oparms.create_options = 0;
         oparms.fid = fid;
         oparms.reconnect = false;
 
@@ -1857,7 +1869,10 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
         oparms.tcon = tcon;
         oparms.desired_access = FILE_READ_ATTRIBUTES;
         oparms.disposition = FILE_OPEN;
-        oparms.create_options = 0;
+        if (backup_cred(cifs_sb))
+                oparms.create_options = CREATE_OPEN_BACKUP_INTENT;
+        else
+                oparms.create_options = 0;
         oparms.fid = &fid;
         oparms.reconnect = false;
 
@@ -3639,7 +3654,7 @@ struct smb_version_values smb21_values = {
 struct smb_version_values smb3any_values = {
         .version_string = SMB3ANY_VERSION_STRING,
         .protocol_id = SMB302_PROT_ID, /* doesn't matter, send protocol array */
-        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,
+        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
         .large_lock_type = 0,
         .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
         .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3660,7 +3675,7 @@ struct smb_version_values smb3any_values = {
 struct smb_version_values smbdefault_values = {
         .version_string = SMBDEFAULT_VERSION_STRING,
         .protocol_id = SMB302_PROT_ID, /* doesn't matter, send protocol array */
-        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,
+        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
         .large_lock_type = 0,
         .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
         .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3681,7 +3696,7 @@ struct smb_version_values smbdefault_values = {
 struct smb_version_values smb30_values = {
         .version_string = SMB30_VERSION_STRING,
         .protocol_id = SMB30_PROT_ID,
-        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,
+        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
         .large_lock_type = 0,
         .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
         .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3702,7 +3717,7 @@ struct smb_version_values smb30_values = {
 struct smb_version_values smb302_values = {
         .version_string = SMB302_VERSION_STRING,
         .protocol_id = SMB302_PROT_ID,
-        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,
+        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
         .large_lock_type = 0,
         .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
         .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
@@ -3723,7 +3738,7 @@ struct smb_version_values smb302_values = {
 struct smb_version_values smb311_values = {
         .version_string = SMB311_VERSION_STRING,
         .protocol_id = SMB311_PROT_ID,
-        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION,
+        .req_capabilities = SMB2_GLOBAL_CAP_DFS | SMB2_GLOBAL_CAP_LEASING | SMB2_GLOBAL_CAP_LARGE_MTU | SMB2_GLOBAL_CAP_PERSISTENT_HANDLES | SMB2_GLOBAL_CAP_ENCRYPTION | SMB2_GLOBAL_CAP_DIRECTORY_LEASING,
         .large_lock_type = 0,
         .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
         .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 5740aa809be6..c08acfc77abc 100644
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2178,6 +2178,9 @@ SMB2_open_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, __u8 *oplock,
         if (!(server->capabilities & SMB2_GLOBAL_CAP_LEASING) ||
             *oplock == SMB2_OPLOCK_LEVEL_NONE)
                 req->RequestedOplockLevel = *oplock;
+        else if (!(server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING) &&
+                  (oparms->create_options & CREATE_NOT_FILE))
+                req->RequestedOplockLevel = *oplock; /* no srv lease support */
         else {
                 rc = add_lease_context(server, iov, &n_iov,
                                        oparms->fid->lease_key, oplock);