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

smb3: correct smb3 ACL security descriptor 



Address warning:

        fs/smbfs_client/smb2pdu.c:2425 create_sd_buf()
        warn: struct type mismatch 'smb3_acl vs cifs_acl'

Pointed out by Dan Carpenter via smatch code analysis tool

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 4f222622

fs/cifs/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -2397,7 +2397,7 @@ create_sd_buf(umode_t mode, bool set_owner, unsigned int *len) 
	buf->sd.OffsetDacl = cpu_to_le32(ptr - (__u8 *)&buf->sd);

	/* Ship the ACL for now. we will copy it into buf later. */

	aclptr = ptr;

	ptr += sizeof(struct cifs_acl);

	ptr += sizeof(struct smb3_acl);



	/* create one ACE to hold the mode embedded in reserved special SID */

	acelen = setup_special_mode_ACE((struct cifs_ace *)ptr, (__u64)mode);
@@ -2422,7 +2422,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);

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

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



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

	*len = roundup(ptr - (__u8 *)buf, 8);