Commit 548e9ad3 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

cifsd: fix warning: variable 'total_ace_size' and 'posix_ccontext' set but not used 



kernel test robot reported warnings:

   fs/cifsd/smbacl.c: In function 'parse_sec_desc':
>> fs/cifsd/smbacl.c:786:6: warning: variable 'total_ace_size' set but
not used [-Wunused-but-set-variable]
     786 |  int total_ace_size = 0, pntsd_type;
         |      ^~~~~~~~~~~~~~
--
   fs/cifsd/smb2pdu.c: In function 'smb2_open':
>> fs/cifsd/smb2pdu.c:3285:26: warning: variable 'posix_ccontext' set but
not used [-Wunused-but-set-variable]
    3285 |   struct create_context *posix_ccontext;
         |                          ^~~~~~~~~~~~~~

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 95fa1ce9

fs/cifsd/smb2pdu.c

+0 −4
Original line number Diff line number Diff line
@@ -3283,10 +3283,6 @@ int smb2_open(struct ksmbd_work *work) 
	}



	if (posix_ctxt) {

		struct create_context *posix_ccontext;



		posix_ccontext = (struct create_context *)(rsp->Buffer +

				le32_to_cpu(rsp->CreateContextsLength));

		contxt_cnt++;

		create_posix_rsp_buf(rsp->Buffer +

				le32_to_cpu(rsp->CreateContextsLength),

fs/cifsd/smbacl.c

+3 −11
Original line number Diff line number Diff line
@@ -389,7 +389,8 @@ static void parse_dacl(struct smb_acl *pdacl, char *end_of_acl, 
		return;



	/* validate that we do not go past end of acl */

	if (end_of_acl < (char *)pdacl + le16_to_cpu(pdacl->size)) {

	if (end_of_acl <= (char *)pdacl ||

	    end_of_acl < (char *)pdacl + le16_to_cpu(pdacl->size)) {

		ksmbd_err("ACL too small to parse DACL\n");

		return;

	}
@@ -783,7 +784,7 @@ int parse_sec_desc(struct smb_ntsd *pntsd, int acl_len, 
	struct smb_acl *dacl_ptr; /* no need for SACL ptr */

	char *end_of_acl = ((char *)pntsd) + acl_len;

	__u32 dacloffset;

	int total_ace_size = 0, pntsd_type;

	int pntsd_type;



	if (pntsd == NULL)

		return -EIO;
@@ -800,16 +801,7 @@ int parse_sec_desc(struct smb_ntsd *pntsd, int acl_len, 
		 le32_to_cpu(pntsd->gsidoffset),

		 le32_to_cpu(pntsd->sacloffset), dacloffset);



	if (dacloffset) {

		if (end_of_acl <= (char *)dacl_ptr ||

		    end_of_acl < (char *)dacl_ptr + le16_to_cpu(dacl_ptr->size))

			return -EIO;

		total_ace_size =

			le16_to_cpu(dacl_ptr->size) - sizeof(struct smb_acl);

	}



	pntsd_type = le16_to_cpu(pntsd->type);



	if (!(pntsd_type & DACL_PRESENT)) {

		ksmbd_debug(SMB, "DACL_PRESENT in DACL type is not set\n");

		return rc;