diff options
| author | Steve French <stfrench@microsoft.com> | 2021-07-07 14:03:54 -0500 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2021-07-07 16:43:17 -0500 |
| commit | d4dc277c480c1faf87d452467d16f513b7ae2fb8 (patch) | |
| tree | 3a35fcbead88505dc1d78ed218f0b54e76a79749 /fs | |
| parent | f371793d6e13a1387b83a72d7bb2c0e3a9ea654f (diff) | |
| download | linux-d4dc277c480c1faf87d452467d16f513b7ae2fb8.tar.gz linux-d4dc277c480c1faf87d452467d16f513b7ae2fb8.tar.bz2 linux-d4dc277c480c1faf87d452467d16f513b7ae2fb8.zip | |
CIFS: Clarify SMB1 code for POSIX Lock
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 PosixLock. This changeset
doesn't change the address but makes it slightly clearer.
Addresses-Coverity: 711520 ("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 16bd4cf3bceb..f72e3b3dca69 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -2537,8 +2537,9 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, pSMB->TotalDataCount = pSMB->DataCount; pSMB->TotalParameterCount = pSMB->ParameterCount; pSMB->ParameterOffset = cpu_to_le16(param_offset); + /* SMB offsets are from the beginning of SMB which is 4 bytes in, after RFC1001 field */ parm_data = (struct cifs_posix_lock *) - (((char *) &pSMB->hdr.Protocol) + offset); + (((char *)pSMB) + offset + 4); parm_data->lock_type = cpu_to_le16(lock_type); if (waitFlag) { |