Commit 2a780e8b authored by Steve French's avatar Steve French
Browse files

CIFS: Clarify SMB1 code for delete 



Coverity also complains about the way we calculate the offset
(starting from the address of a 4 byte array within the
header structure rather than from the beginning of the struct
plus 4 bytes) for SMB1 SetFileDisposition (which is used to
unlink a file by setting the delete on close flag).  This
changeset doesn't change the address but makes it slightly
clearer.

Addresses-Coverity: 711524 ("Out of bounds write")
Reviewed-by: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent e3973ea3

fs/cifs/cifssmb.c

+2 −1
Original line number Diff line number Diff line
@@ -5763,7 +5763,8 @@ CIFSSMBSetFileDisposition(const unsigned int xid, struct cifs_tcon *tcon, 
	param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;

	offset = param_offset + params;



	data_offset = (char *) (&pSMB->hdr.Protocol) + offset;

	/* SMB offsets are from the beginning of SMB which is 4 bytes in, after RFC1001 field */

	data_offset = (char *)(pSMB) + offset + 4;



	count = 1;

	pSMB->MaxParameterCount = cpu_to_le16(2);