diff options
| author | Enzo Matsumiya <ematsumiya@suse.de> | 2023-01-18 14:06:57 -0300 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2023-01-18 14:44:30 -0600 |
| commit | 30b2b2196d6e4cc24cbec633535a2404f258ce69 (patch) | |
| tree | e7336954b1af2b6957d6439ff9ee10a289de9b3a /fs | |
| parent | d6a49e8c4ca4d399ed65ac219585187fc8c2e2b1 (diff) | |
| download | linux-stable-30b2b2196d6e4cc24cbec633535a2404f258ce69.tar.gz linux-stable-30b2b2196d6e4cc24cbec633535a2404f258ce69.tar.bz2 linux-stable-30b2b2196d6e4cc24cbec633535a2404f258ce69.zip | |
cifs: do not include page data when checking signature
On async reads, page data is allocated before sending. When the
response is received but it has no data to fill (e.g.
STATUS_END_OF_FILE), __calc_signature() will still include the pages in
its computation, leading to an invalid signature check.
This patch fixes this by not setting the async read smb_rqst page data
(zeroed by default) if its got_bytes is 0.
This can be reproduced/verified with xfstests generic/465.
Cc: <stable@vger.kernel.org>
Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
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/smb2pdu.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 4b71f4a92f76..2c9ffa921e6f 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -4163,12 +4163,15 @@ smb2_readv_callback(struct mid_q_entry *mid) (struct smb2_hdr *)rdata->iov[0].iov_base; struct cifs_credits credits = { .value = 0, .instance = 0 }; struct smb_rqst rqst = { .rq_iov = &rdata->iov[1], - .rq_nvec = 1, - .rq_pages = rdata->pages, - .rq_offset = rdata->page_offset, - .rq_npages = rdata->nr_pages, - .rq_pagesz = rdata->pagesz, - .rq_tailsz = rdata->tailsz }; + .rq_nvec = 1, }; + + if (rdata->got_bytes) { + rqst.rq_pages = rdata->pages; + rqst.rq_offset = rdata->page_offset; + rqst.rq_npages = rdata->nr_pages; + rqst.rq_pagesz = rdata->pagesz; + rqst.rq_tailsz = rdata->tailsz; + } WARN_ONCE(rdata->server != mid->server, "rdata server %p != mid server %p", |