diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-09 14:42:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-09 14:42:57 -0800 |
| commit | a28348322f79799d34867138806aa3cd15993d59 (patch) | |
| tree | 41521d484e29c27f928cd99b42b9a6bb5cffec96 /fs/cifs/cifssmb.c | |
| parent | 58fcba61dea4a238f907bf7eb8b9c95427c27f28 (diff) | |
| parent | 5f60a56494ea5518376b274dd93b3ceee9a783fb (diff) | |
| download | linux-a28348322f79799d34867138806aa3cd15993d59.tar.gz linux-a28348322f79799d34867138806aa3cd15993d59.tar.bz2 linux-a28348322f79799d34867138806aa3cd15993d59.zip | |
Merge tag '4.16-minor-rc-SMB3-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"There are a couple additional security fixes that are still being
tested that are not in this set."
* tag '4.16-minor-rc-SMB3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
Add missing structs and defines from recent SMB3.1.1 documentation
address lock imbalance warnings in smbdirect.c
cifs: silence compiler warnings showing up with gcc-8.0.0
Add some missing debug fields in server and tcon structs
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 4e0922d24eb2..9ceebf30eb22 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -6343,9 +6343,7 @@ SetEARetry: pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_EA); - parm_data = - (struct fealist *) (((char *) &pSMB->hdr.Protocol) + - offset); + parm_data = (void *)pSMB + offsetof(struct smb_hdr, Protocol) + offset; pSMB->ParameterOffset = cpu_to_le16(param_offset); pSMB->DataOffset = cpu_to_le16(offset); pSMB->SetupCount = 1; |