diff options
| author | Steve French <stfrench@microsoft.com> | 2021-07-06 21:42:08 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2021-07-07 11:53:17 -0500 |
| commit | 2a780e8b64874ae5b4201a491799aef838da7bdd (patch) | |
| tree | 0cc1f93971aeff9b5d02c0b57def21ad0d0b56b1 | |
| parent | e3973ea3a7c218c1e92bdbfe1da934ef69d7a4ed (diff) | |
| download | linux-2a780e8b64874ae5b4201a491799aef838da7bdd.tar.bz2 | |
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>
| -rw-r--r-- | fs/cifs/cifssmb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index a513a89aad1a..0863238ddd20 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -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); |