diff options
| author |   Steve French <stfrench@microsoft.com> | 2021-07-07 13:34:47 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2021-07-07 16:42:25 -0500 |
| commit | f371793d6e13a1387b83a72d7bb2c0e3a9ea654f (patch) | |
| tree | b1576e13bcf69a96966bb1d75026a77f37a23eb8 /fs | |
| parent | CIFS: Clarify SMB1 code for delete (diff) | |
| download | linux-dev-f371793d6e13a1387b83a72d7bb2c0e3a9ea654f.tar.xz linux-dev-f371793d6e13a1387b83a72d7bb2c0e3a9ea654f.zip | |
CIFS: Clarify SMB1 code for rename open file
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 RenameOpenFile. This changeset
doesn't change the address but makes it slightly clearer.
Addresses-Coverity: 711521 ("Out of bounds write")
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs')
| -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 0863238ddd20..16bd4cf3bceb 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -2767,7 +2767,8 @@ int CIFSSMBRenameOpenFile(const unsigned int xid, struct cifs_tcon *pTcon, 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; rename_info = (struct set_file_rename *) data_offset; pSMB->MaxParameterCount = cpu_to_le16(2); pSMB->MaxDataCount = cpu_to_le16(1000); /* BB find max SMB from sess */ |