Skip to content

Commit 2a780e8

Browse files
committed
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: Paulo Alcantara (SUSE) <pc@cjr.nz> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent e3973ea commit 2a780e8

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

fs/cifs/cifssmb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5763,7 +5763,8 @@ CIFSSMBSetFileDisposition(const unsigned int xid, struct cifs_tcon *tcon,
57635763
param_offset = offsetof(struct smb_com_transaction2_sfi_req, Fid) - 4;
57645764
offset = param_offset + params;
57655765

5766-
data_offset = (char *) (&pSMB->hdr.Protocol) + offset;
5766+
/* SMB offsets are from the beginning of SMB which is 4 bytes in, after RFC1001 field */
5767+
data_offset = (char *)(pSMB) + offset + 4;
57675768

57685769
count = 1;
57695770
pSMB->MaxParameterCount = cpu_to_le16(2);

0 commit comments

Comments
 (0)