]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
smb3: fix signing verification of large reads
authorSteve French <stfrench@microsoft.com>
Thu, 5 Sep 2019 04:07:52 +0000 (23:07 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Feb 2020 12:33:58 +0000 (04:33 -0800)
[ Upstream commit 46f17d17687e8140f2e4e517d7dfa65e62fcc5f4 ]

Code cleanup in the 5.1 kernel changed the array
passed into signing verification on large reads leading
to warning messages being logged when copying files to local
systems from remote.

   SMB signature verification returned error = -5

This changeset fixes verification of SMB3 signatures of large
reads.

Suggested-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/cifs/smb2pdu.c

index 43f29621e51ff901ec2a755698863e7ddc7177db..93ef1d8e82c75dd9f5809d8666a87c4854c6f7eb 100644 (file)
@@ -3130,8 +3130,8 @@ smb2_readv_callback(struct mid_q_entry *mid)
        struct smb2_sync_hdr *shdr =
                                (struct smb2_sync_hdr *)rdata->iov[0].iov_base;
        unsigned int credits_received = 0;
-       struct smb_rqst rqst = { .rq_iov = rdata->iov,
-                                .rq_nvec = 2,
+       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,