fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/series b/queue-4.19/series
index 8ac719bc014ca15d5276751595822963a0c548c8..053f2a0d6f5ce823e4f3e9cd6a52dd13cb7a01f7 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -43,3 +43,4 @@ media-v4l2-rect.h-fix-v4l2_rect_map_inside-top-left-adjustments.patch
 lib-test_kasan.c-fix-memory-leak-in-kmalloc_oob_krealloc_more.patch
 irqdomain-fix-a-memory-leak-in-irq_domain_push_irq.patch
 platform-x86-intel_scu_ipc-fix-interrupt-support.patch
+smb3-fix-signing-verification-of-large-reads.patch

diff --git a/queue-4.19/smb3-fix-signing-verification-of-large-reads.patch b/queue-4.19/smb3-fix-signing-verification-of-large-reads.patch
new file mode 100644 (file)
index 0000000..f066c2d
--- /dev/null
+++ b/queue-4.19/smb3-fix-signing-verification-of-large-reads.patch
@@ -0,0 +1,45 @@
+From bc1b38532440bcaf1920f4a79e95132088b9fb8d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 4 Sep 2019 23:07:52 -0500
+Subject: smb3: fix signing verification of large reads
+
+From: Steve French <stfrench@microsoft.com>
+
+[ 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 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
+index 43f29621e51ff..93ef1d8e82c75 100644
+--- a/fs/cifs/smb2pdu.c
++++ b/fs/cifs/smb2pdu.c
+@@ -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,
+-- 
+2.20.1
+