diff options
| author | Ronnie Sahlberg <lsahlber@redhat.com> | 2020-01-08 04:08:07 +0100 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2020-01-27 02:24:16 +0100 |
| commit | 731b82bb1750a906c1e7f070aedf5505995ebea7 (patch) | |
| tree | 0141e8c00b2db22b0eb079d3af60f2898178bff0 /fs | |
| parent | cifs: use compounding for open and first query-dir for readdir() (diff) | |
| download | linux-731b82bb1750a906c1e7f070aedf5505995ebea7.tar.xz linux-731b82bb1750a906c1e7f070aedf5505995ebea7.zip | |
cifs: set correct max-buffer-size for smb2_ioctl_init()
Fix two places where we need to adjust down the max response size for
ioctl when it is used together with compounding.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
CC: Stable <stable@vger.kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/smb2ops.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index ccaff438b94d..2e532f053b8c 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1523,7 +1523,9 @@ smb2_ioctl_query_info(const unsigned int xid, COMPOUND_FID, COMPOUND_FID, qi.info_type, true, buffer, qi.output_buffer_length, - CIFSMaxBufSize); + CIFSMaxBufSize - + MAX_SMB2_CREATE_RESPONSE_SIZE - + MAX_SMB2_CLOSE_RESPONSE_SIZE); } } else if (qi.flags == PASSTHRU_SET_INFO) { /* Can eventually relax perm check since server enforces too */ @@ -2769,7 +2771,10 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, rc = SMB2_ioctl_init(tcon, &rqst[1], fid.persistent_fid, fid.volatile_fid, FSCTL_GET_REPARSE_POINT, - true /* is_fctl */, NULL, 0, CIFSMaxBufSize); + true /* is_fctl */, NULL, 0, + CIFSMaxBufSize - + MAX_SMB2_CREATE_RESPONSE_SIZE - + MAX_SMB2_CLOSE_RESPONSE_SIZE); if (rc) goto querty_exit; |