4.19-stable patches

added patches:
	cifs-fix-error-mapping-for-smb2_lock-command-which-caused-ofd-lock-problem.patch
	smb3-fix-large-reads-on-encrypted-connections.patch

diff --git a/queue-4.19/cifs-fix-error-mapping-for-smb2_lock-command-which-caused-ofd-lock-problem.patch b/queue-4.19/cifs-fix-error-mapping-for-smb2_lock-command-which-caused-ofd-lock-problem.patch
new file mode 100644 (file)
index 0000000..5ebbd6a
--- /dev/null
+++ b/queue-4.19/cifs-fix-error-mapping-for-smb2_lock-command-which-caused-ofd-lock-problem.patch
@@ -0,0 +1,52 @@
+From 9a596f5b39593414c0ec80f71b94a226286f084e Mon Sep 17 00:00:00 2001
+From: Georgy A Bystrenin <gkot@altlinux.org>
+Date: Fri, 21 Dec 2018 00:11:42 -0600
+Subject: CIFS: Fix error mapping for SMB2_LOCK command which caused OFD lock problem
+
+From: Georgy A Bystrenin <gkot@altlinux.org>
+
+commit 9a596f5b39593414c0ec80f71b94a226286f084e upstream.
+
+While resolving a bug with locks on samba shares found a strange behavior.
+When a file locked by one node and we trying to lock it from another node
+it fail with errno 5 (EIO) but in that case errno must be set to
+(EACCES | EAGAIN).
+This isn't happening when we try to lock file second time on same node.
+In this case it returns EACCES as expected.
+Also this issue not reproduces when we use SMB1 protocol (vers=1.0 in
+mount options).
+
+Further investigation showed that the mapping from status_to_posix_error
+is different for SMB1 and SMB2+ implementations.
+For SMB1 mapping is [NT_STATUS_LOCK_NOT_GRANTED to ERRlock]
+(See fs/cifs/netmisc.c line 66)
+but for SMB2+ mapping is [STATUS_LOCK_NOT_GRANTED to -EIO]
+(see fs/cifs/smb2maperror.c line 383)
+
+Quick changes in SMB2+ mapping from EIO to EACCES has fixed issue.
+
+BUG: https://bugzilla.kernel.org/show_bug.cgi?id=201971
+
+Signed-off-by: Georgy A Bystrenin <gkot@altlinux.org>
+Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
+CC: Stable <stable@vger.kernel.org>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/cifs/smb2maperror.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/cifs/smb2maperror.c
++++ b/fs/cifs/smb2maperror.c
+@@ -379,8 +379,8 @@ static const struct status_to_posix_erro
+       {STATUS_NONEXISTENT_EA_ENTRY, -EIO, "STATUS_NONEXISTENT_EA_ENTRY"},
+       {STATUS_NO_EAS_ON_FILE, -ENODATA, "STATUS_NO_EAS_ON_FILE"},
+       {STATUS_EA_CORRUPT_ERROR, -EIO, "STATUS_EA_CORRUPT_ERROR"},
+-      {STATUS_FILE_LOCK_CONFLICT, -EIO, "STATUS_FILE_LOCK_CONFLICT"},
+-      {STATUS_LOCK_NOT_GRANTED, -EIO, "STATUS_LOCK_NOT_GRANTED"},
++      {STATUS_FILE_LOCK_CONFLICT, -EACCES, "STATUS_FILE_LOCK_CONFLICT"},
++      {STATUS_LOCK_NOT_GRANTED, -EACCES, "STATUS_LOCK_NOT_GRANTED"},
+       {STATUS_DELETE_PENDING, -ENOENT, "STATUS_DELETE_PENDING"},
+       {STATUS_CTL_FILE_NOT_SUPPORTED, -ENOSYS,
+       "STATUS_CTL_FILE_NOT_SUPPORTED"},

diff --git a/queue-4.19/series b/queue-4.19/series
index 89f93f2110fbbab603bcfb7130fe3859ab120605..d31aca776b72d154b4e0aea889594e000c7372a2 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -154,3 +154,5 @@ mips-align-kernel-load-address-to-64kb.patch
 mips-expand-mips32-asids-to-64-bits.patch
 mips-octeon-mark-rgmii-interface-disabled-on-octeon-iii.patch
 mips-fix-a-r10000_llsc_war-logic-in-atomic.h.patch
+cifs-fix-error-mapping-for-smb2_lock-command-which-caused-ofd-lock-problem.patch
+smb3-fix-large-reads-on-encrypted-connections.patch

diff --git a/queue-4.19/smb3-fix-large-reads-on-encrypted-connections.patch b/queue-4.19/smb3-fix-large-reads-on-encrypted-connections.patch
new file mode 100644 (file)
index 0000000..2402f97
--- /dev/null
+++ b/queue-4.19/smb3-fix-large-reads-on-encrypted-connections.patch
@@ -0,0 +1,43 @@
+From 6d2f84eee098540ae857998fe32f29b9e2cd9613 Mon Sep 17 00:00:00 2001
+From: Paul Aurich <paul@darkrain42.org>
+Date: Mon, 31 Dec 2018 14:13:34 -0800
+Subject: smb3: fix large reads on encrypted connections
+
+From: Paul Aurich <paul@darkrain42.org>
+
+commit 6d2f84eee098540ae857998fe32f29b9e2cd9613 upstream.
+
+When passing a large read to receive_encrypted_read(), ensure that the
+demultiplex_thread knows that a MID was processed.  Without this, those
+operations never complete.
+
+This is a similar issue/fix to lease break handling:
+commit 7af929d6d05ba5564139718e30d5bc96bdbc716a
+("smb3: fix lease break problem introduced by compounding")
+
+CC: Stable <stable@vger.kernel.org> # 4.19+
+Fixes: b24df3e30cbf ("cifs: update receive_encrypted_standard to handle compounded responses")
+Signed-off-by: Paul Aurich <paul@darkrain42.org>
+Tested-by: Yves-Alexis Perez <corsac@corsac.net>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/cifs/smb2ops.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/fs/cifs/smb2ops.c
++++ b/fs/cifs/smb2ops.c
+@@ -3184,8 +3184,10 @@ smb3_receive_transform(struct TCP_Server
+       }
+ 
+       /* TODO: add support for compounds containing READ. */
+-      if (pdu_length > CIFSMaxBufSize + MAX_HEADER_SIZE(server))
++      if (pdu_length > CIFSMaxBufSize + MAX_HEADER_SIZE(server)) {
++              *num_mids = 1;
+               return receive_encrypted_read(server, &mids[0]);
++      }
+ 
+       return receive_encrypted_standard(server, mids, bufs, num_mids);
+ }