Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b306339 authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

cifs: version operations for smb20 unneeded when legacy support disabled 



[ Upstream commit 7ef93ffccd55fb0ba000ed16ef6a81cd7dee07b5 ]

We should not be including unused smb20 specific code when legacy
support is disabled (CONFIG_CIFS_ALLOW_INSECURE_LEGACY turned
off).  For example smb2_operations and smb2_values aren't used
in that case.  Over time we can move more and more SMB1/CIFS and SMB2.0
code into the insecure legacy ifdefs

Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5cb13cdc

fs/cifs/cifsglob.h

+3 −1
Original line number Diff line number Diff line
@@ -1930,11 +1930,13 @@ extern mempool_t *cifs_mid_poolp; 


/* Operations for different SMB versions */

#define SMB1_VERSION_STRING	"1.0"

#define SMB20_VERSION_STRING    "2.0"

#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY

extern struct smb_version_operations smb1_operations;

extern struct smb_version_values smb1_values;

#define SMB20_VERSION_STRING	"2.0"

extern struct smb_version_operations smb20_operations;

extern struct smb_version_values smb20_values;

#endif /* CIFS_ALLOW_INSECURE_LEGACY */

#define SMB21_VERSION_STRING	"2.1"

extern struct smb_version_operations smb21_operations;

extern struct smb_version_values smb21_values;

fs/cifs/smb2ops.c

+6 −1
Original line number Diff line number Diff line
@@ -3487,11 +3487,13 @@ smb3_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock, 
	}

}



#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY

static bool

smb2_is_read_op(__u32 oplock)

{

	return oplock == SMB2_OPLOCK_LEVEL_II;

}

#endif /* CIFS_ALLOW_INSECURE_LEGACY */



static bool

smb21_is_read_op(__u32 oplock)
@@ -4573,7 +4575,7 @@ smb2_make_node(unsigned int xid, struct inode *inode, 
	return rc;

}





#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY

struct smb_version_operations smb20_operations = {

	.compare_fids = smb2_compare_fids,

	.setup_request = smb2_setup_request,
@@ -4670,6 +4672,7 @@ struct smb_version_operations smb20_operations = { 
	.fiemap = smb3_fiemap,

	.llseek = smb3_llseek,

};

#endif /* CIFS_ALLOW_INSECURE_LEGACY */



struct smb_version_operations smb21_operations = {

	.compare_fids = smb2_compare_fids,
@@ -4987,6 +4990,7 @@ struct smb_version_operations smb311_operations = { 
	.llseek = smb3_llseek,

};



#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY

struct smb_version_values smb20_values = {

	.version_string = SMB20_VERSION_STRING,

	.protocol_id = SMB20_PROT_ID,
@@ -5007,6 +5011,7 @@ struct smb_version_values smb20_values = { 
	.signing_required = SMB2_NEGOTIATE_SIGNING_REQUIRED,

	.create_lease_size = sizeof(struct create_lease),

};

#endif /* ALLOW_INSECURE_LEGACY */



struct smb_version_values smb21_values = {

	.version_string = SMB21_VERSION_STRING,