cifs: add new fields to cifs_ses to track requested security flavor

Currently we have the overrideSecFlg field, but it's quite cumbersome
to work with. Add some new fields that will eventually supercede it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 3752b9f6d9e46e90876b18f4d14527f9262baff6..0f36654f22d0b8ced402ed5e849c6fa0caa14c9a 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -312,11 +312,14 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server)
 }
 
 static void
-cifs_show_security(struct seq_file *s, struct TCP_Server_Info *server)
+cifs_show_security(struct seq_file *s, struct cifs_ses *ses)
 {
+       if (ses->sectype == Unspecified)
+               return;
+
        seq_printf(s, ",sec=");
 
-       switch (server->secType) {
+       switch (ses->sectype) {
        case LANMAN:
                seq_printf(s, "lanman");
                break;
@@ -338,7 +341,7 @@ cifs_show_security(struct seq_file *s, struct TCP_Server_Info *server)
                break;
        }
 
-       if (server->sec_mode & (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))
+       if (ses->sign)
                seq_printf(s, "i");
 }
 
@@ -369,7 +372,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
        srcaddr = (struct sockaddr *)&tcon->ses->server->srcaddr;
 
        seq_printf(s, ",vers=%s", tcon->ses->server->vals->version_string);
-       cifs_show_security(s, tcon->ses->server);
+       cifs_show_security(s, tcon->ses);
        cifs_show_cache_flavor(s, cifs_sb);
 
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER)

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 82ba4b9748949b9326648e8f8e5421bc46476547..87d92e35e991de067a53bc9e18bb56e50cb5c040 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -712,6 +712,8 @@ struct cifs_ses {
        char *password;
        struct session_key auth_key;
        struct ntlmssp_auth *ntlmssp; /* ciphertext, flags, server challenge */
+       enum securityEnum sectype; /* what security flavor was specified? */
+       bool sign;              /* is signing required? */
        bool need_reconnect:1; /* connection reset, uid now invalid */
 #ifdef CONFIG_CIFS_SMB2
        __u16 session_flags;

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 160134902233a1b1e88814f87c87c3921f61a4d8..2a8b2107ad5f87e94bac6cf4ce8870ea25078846 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2501,6 +2501,8 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
        ses->linux_uid = volume_info->linux_uid;
 
        ses->overrideSecFlg = volume_info->secFlg;
+       ses->sectype = volume_info->sectype;
+       ses->sign = volume_info->sign;
 
        mutex_lock(&ses->session_mutex);
        rc = cifs_negotiate_protocol(xid, ses);
@@ -3918,6 +3920,8 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, kuid_t fsuid)
        vol_info->nocase = master_tcon->nocase;
        vol_info->local_lease = master_tcon->local_lease;
        vol_info->no_linux_ext = !master_tcon->unix_ext;
+       vol_info->sectype = master_tcon->ses->sectype;
+       vol_info->sign = master_tcon->ses->sign;
 
        rc = cifs_set_vol_auth(vol_info, master_tcon->ses);
        if (rc) {