Commit 28e11bd8 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent e598d1d8

fs/cifs/cifsfs.c

+7 −4
Original line number Diff line number Diff line
@@ -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)

fs/cifs/cifsglob.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

fs/cifs/connect.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {