diff options
| author | Enzo Matsumiya <ematsumiya@suse.de> | 2023-01-11 14:48:49 -0300 |
|---|---|---|
| committer | Enzo Matsumiya <ematsumiya@suse.de> | 2023-01-11 17:05:22 -0300 |
| commit | a4ebb40cd6e01763cf9d2cd182946ba5f131591a (patch) | |
| tree | 4160f6c513899b5aa48c8fe854dec6380a243a81 | |
| parent | 330e1dd5222f67338903ef05d20797def7d8a5c3 (diff) | |
| download | linux-cifs.tar.gz linux-cifs.tar.bz2 linux-cifs.zip | |
cifs: do not include page data when checking signaturecifs
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.
Set smb_rqst page data to 0 when an async read's got_bytes is 0.
This can be reproduced/verified with xfstests generic/465.
Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
| -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", |