1 files changed, 83 insertions, 19 deletions

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index f2e76f3b0c61..f259e6cc8357 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -213,22 +213,29 @@ smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon,
                         struct cifs_sb_info *cifs_sb, const char *full_path)
 {
         int rc;
-        __u64 persistent_fid, volatile_fid;
         __le16 *utf16_path;
         __u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
+        struct cifs_open_parms oparms;
+        struct cifs_fid fid;
 
         utf16_path = cifs_convert_path_to_utf16(full_path, cifs_sb);
         if (!utf16_path)
                 return -ENOMEM;
 
-        rc = SMB2_open(xid, tcon, utf16_path, &persistent_fid, &volatile_fid,
-                       FILE_READ_ATTRIBUTES, FILE_OPEN, 0, 0, &oplock, NULL);
+        oparms.tcon = tcon;
+        oparms.desired_access = FILE_READ_ATTRIBUTES;
+        oparms.disposition = FILE_OPEN;
+        oparms.create_options = 0;
+        oparms.fid = &fid;
+        oparms.reconnect = false;
+
+        rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL);
         if (rc) {
                 kfree(utf16_path);
                 return rc;
         }
 
-        rc = SMB2_close(xid, tcon, persistent_fid, volatile_fid);
+        rc = SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
         kfree(utf16_path);
         return rc;
 }
@@ -281,6 +288,25 @@ smb2_clear_stats(struct cifs_tcon *tcon)
 }
 
 static void
+smb2_dump_share_caps(struct seq_file *m, struct cifs_tcon *tcon)
+{
+        seq_puts(m, "\n\tShare Capabilities:");
+        if (tcon->capabilities & SMB2_SHARE_CAP_DFS)
+                seq_puts(m, " DFS,");
+        if (tcon->capabilities & SMB2_SHARE_CAP_CONTINUOUS_AVAILABILITY)
+                seq_puts(m, " CONTINUOUS AVAILABILITY,");
+        if (tcon->capabilities & SMB2_SHARE_CAP_SCALEOUT)
+                seq_puts(m, " SCALEOUT,");
+        if (tcon->capabilities & SMB2_SHARE_CAP_CLUSTER)
+                seq_puts(m, " CLUSTER,");
+        if (tcon->capabilities & SMB2_SHARE_CAP_ASYMMETRIC)
+                seq_puts(m, " ASYMMETRIC,");
+        if (tcon->capabilities == 0)
+                seq_puts(m, " None");
+        seq_printf(m, "\tShare Flags: 0x%x", tcon->share_flags);
+}
+
+static void
 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
 {
 #ifdef CONFIG_CIFS_STATS
@@ -292,7 +318,6 @@ smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
         seq_printf(m, "\nSessionSetups: %d sent %d failed",
                    atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
                    atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
-#define SMB2LOGOFF              0x0002 /* trivial request/resp */
         seq_printf(m, "\nLogoffs: %d sent %d failed",
                    atomic_read(&sent[SMB2_LOGOFF_HE]),
                    atomic_read(&failed[SMB2_LOGOFF_HE]));
@@ -425,15 +450,20 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
         __le16 *utf16_path;
         int rc;
         __u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
-        __u64 persistent_fid, volatile_fid;
+        struct cifs_open_parms oparms;
 
         utf16_path = cifs_convert_path_to_utf16(path, cifs_sb);
         if (!utf16_path)
                 return -ENOMEM;
 
-        rc = SMB2_open(xid, tcon, utf16_path, &persistent_fid, &volatile_fid,
-                       FILE_READ_ATTRIBUTES | FILE_READ_DATA, FILE_OPEN, 0, 0,
-                       &oplock, NULL);
+        oparms.tcon = tcon;
+        oparms.desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA;
+        oparms.disposition = FILE_OPEN;
+        oparms.create_options = 0;
+        oparms.fid = fid;
+        oparms.reconnect = false;
+
+        rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL);
         kfree(utf16_path);
         if (rc) {
                 cifs_dbg(VFS, "open dir failed\n");
@@ -442,14 +472,12 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon,
 
         srch_inf->entries_in_buffer = 0;
         srch_inf->index_of_last_entry = 0;
-        fid->persistent_fid = persistent_fid;
-        fid->volatile_fid = volatile_fid;
 
-        rc = SMB2_query_directory(xid, tcon, persistent_fid, volatile_fid, 0,
-                                  srch_inf);
+        rc = SMB2_query_directory(xid, tcon, fid->persistent_fid,
+                                  fid->volatile_fid, 0, srch_inf);
         if (rc) {
                 cifs_dbg(VFS, "query directory failed\n");
-                SMB2_close(xid, tcon, persistent_fid, volatile_fid);
+                SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid);
         }
         return rc;
 }
@@ -510,17 +538,25 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon,
              struct kstatfs *buf)
 {
         int rc;
-        u64 persistent_fid, volatile_fid;
         __le16 srch_path = 0; /* Null - open root of share */
         u8 oplock = SMB2_OPLOCK_LEVEL_NONE;
+        struct cifs_open_parms oparms;
+        struct cifs_fid fid;
+
+        oparms.tcon = tcon;
+        oparms.desired_access = FILE_READ_ATTRIBUTES;
+        oparms.disposition = FILE_OPEN;
+        oparms.create_options = 0;
+        oparms.fid = &fid;
+        oparms.reconnect = false;
 
-        rc = SMB2_open(xid, tcon, &srch_path, &persistent_fid, &volatile_fid,
-                       FILE_READ_ATTRIBUTES, FILE_OPEN, 0, 0, &oplock, NULL);
+        rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL);
         if (rc)
                 return rc;
         buf->f_type = SMB2_MAGIC_NUMBER;
-        rc = SMB2_QFS_info(xid, tcon, persistent_fid, volatile_fid, buf);
-        SMB2_close(xid, tcon, persistent_fid, volatile_fid);
+        rc = SMB2_QFS_info(xid, tcon, fid.persistent_fid, fid.volatile_fid,
+                           buf);
+        SMB2_close(xid, tcon, fid.persistent_fid, fid.volatile_fid);
         return rc;
 }
 
@@ -645,6 +681,7 @@ struct smb_version_operations smb30_operations = {
         .dump_detail = smb2_dump_detail,
         .clear_stats = smb2_clear_stats,
         .print_stats = smb2_print_stats,
+        .dump_share_caps = smb2_dump_share_caps,
         .is_oplock_break = smb2_is_valid_oplock_break,
         .need_neg = smb2_need_neg,
         .negotiate = smb2_negotiate,
@@ -690,6 +727,7 @@ struct smb_version_operations smb30_operations = {
         .get_lease_key = smb2_get_lease_key,
         .set_lease_key = smb2_set_lease_key,
         .new_lease_key = smb2_new_lease_key,
+        .generate_signingkey = generate_smb3signingkey,
         .calc_signature = smb3_calc_signature,
 };
 
@@ -709,6 +747,8 @@ struct smb_version_values smb20_values = {
         .cap_nt_find = SMB2_NT_FIND,
         .cap_large_files = SMB2_LARGE_FILES,
         .oplock_read = SMB2_OPLOCK_LEVEL_II,
+        .signing_enabled = SMB2_NEGOTIATE_SIGNING_ENABLED | SMB2_NEGOTIATE_SIGNING_REQUIRED,
+        .signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED,
 };
 
 struct smb_version_values smb21_values = {
@@ -727,6 +767,8 @@ struct smb_version_values smb21_values = {
         .cap_nt_find = SMB2_NT_FIND,
         .cap_large_files = SMB2_LARGE_FILES,
         .oplock_read = SMB2_OPLOCK_LEVEL_II,
+        .signing_enabled = SMB2_NEGOTIATE_SIGNING_ENABLED | SMB2_NEGOTIATE_SIGNING_REQUIRED,
+        .signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED,
 };
 
 struct smb_version_values smb30_values = {
@@ -745,4 +787,26 @@ struct smb_version_values smb30_values = {
         .cap_nt_find = SMB2_NT_FIND,
         .cap_large_files = SMB2_LARGE_FILES,
         .oplock_read = SMB2_OPLOCK_LEVEL_II,
+        .signing_enabled = SMB2_NEGOTIATE_SIGNING_ENABLED | SMB2_NEGOTIATE_SIGNING_REQUIRED,
+        .signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED,
+};
+
+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,
+        .large_lock_type = 0,
+        .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE_LOCK,
+        .shared_lock_type = SMB2_LOCKFLAG_SHARED_LOCK,
+        .unlock_lock_type = SMB2_LOCKFLAG_UNLOCK,
+        .header_size = sizeof(struct smb2_hdr),
+        .max_header_size = MAX_SMB2_HDR_SIZE,
+        .read_rsp_size = sizeof(struct smb2_read_rsp) - 1,
+        .lock_cmd = SMB2_LOCK,
+        .cap_unix = 0,
+        .cap_nt_find = SMB2_NT_FIND,
+        .cap_large_files = SMB2_LARGE_FILES,
+        .oplock_read = SMB2_OPLOCK_LEVEL_II,
+        .signing_enabled = SMB2_NEGOTIATE_SIGNING_ENABLED | SMB2_NEGOTIATE_SIGNING_REQUIRED,
+        .signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED,
 };