Commit f09bd695 authored by Steve French's avatar Steve French
Browse files

smb3: must initialize two ACL struct fields to zero 



Coverity spotted that we were not initalizing Stbz1 and Stbz2 to
zero in create_sd_buf.

Addresses-Coverity: 1513848 ("Uninitialized scalar variable")
Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent b854b4ee

fs/cifs/smb2pdu.c

+2 −1
Original line number Diff line number Diff line
@@ -2420,7 +2420,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) 
	unsigned int acelen, acl_size, ace_count;

	unsigned int owner_offset = 0;

	unsigned int group_offset = 0;

	struct smb3_acl acl;

	struct smb3_acl acl = {};



	*len = round_up(sizeof(struct crt_sd_ctxt) + (sizeof(struct cifs_ace) * 4), 8);
@@ -2493,6 +2493,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) 
	acl.AclRevision = ACL_REVISION; /* See 2.4.4.1 of MS-DTYP */

	acl.AclSize = cpu_to_le16(acl_size);

	acl.AceCount = cpu_to_le16(ace_count);

	/* acl.Sbz1 and Sbz2 MBZ so are not set here, but initialized above */

	memcpy(aclptr, &acl, sizeof(struct smb3_acl));



	buf->ccontext.DataLength = cpu_to_le32(ptr - (__u8 *)&buf->sd);