4.9-stable patches

added patches:
	smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index 34e9f5b904d639099098686311e56664da137dc9..73138fff65611a28daf6bb08825eee4ef920d670 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -164,3 +164,4 @@ irqdomain-treewide-free-firmware-node-after-domain-removal.patch
 xen-balloon-fix-accounting-in-alloc_xenballooned_pages-error-path.patch
 xen-balloon-make-the-balloon-wait-interruptible.patch
 net-initialize-fastreuse-on-inet_inherit_port.patch
+smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch

diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..3ebafee
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1,2 @@
+smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch
+genirq-affinity-make-affinity-setting-if-activated-opt-in.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index 718cce38617d54977bf24d9c44a97aa73031cdf7..fc691de97253ffa18cadcd906f3995eec86ecb3c 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -166,3 +166,4 @@ parisc-mask-out-enable-and-reserved-bits-from-sba-imask.patch
 arm-8992-1-fix-unwind_frame-for-clang-built-kernels.patch
 xen-balloon-fix-accounting-in-alloc_xenballooned_pages-error-path.patch
 xen-balloon-make-the-balloon-wait-interruptible.patch
+smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch

diff --git a/queue-4.9/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch b/queue-4.9/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch
new file mode 100644 (file)
index 0000000..308daec
--- /dev/null
+++ b/queue-4.9/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch
@@ -0,0 +1,35 @@
+From 0a018944eee913962bce8ffebbb121960d5125d9 Mon Sep 17 00:00:00 2001
+From: Steve French <stfrench@microsoft.com>
+Date: Thu, 16 Jul 2020 00:34:21 -0500
+Subject: smb3: warn on confusing error scenario with sec=krb5
+
+From: Steve French <stfrench@microsoft.com>
+
+commit 0a018944eee913962bce8ffebbb121960d5125d9 upstream.
+
+When mounting with Kerberos, users have been confused about the
+default error returned in scenarios in which either keyutils is
+not installed or the user did not properly acquire a krb5 ticket.
+Log a warning message in the case that "ENOKEY" is returned
+from the get_spnego_key upcall so that users can better understand
+why mount failed in those two cases.
+
+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/smb2pdu.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/cifs/smb2pdu.c
++++ b/fs/cifs/smb2pdu.c
+@@ -776,6 +776,8 @@ SMB2_auth_kerberos(struct SMB2_sess_data
+       spnego_key = cifs_get_spnego_key(ses);
+       if (IS_ERR(spnego_key)) {
+               rc = PTR_ERR(spnego_key);
++              if (rc == -ENOKEY)
++                      cifs_dbg(VFS, "Verify user has a krb5 ticket and keyutils is installed\n");
+               spnego_key = NULL;
+               goto out;
+       }

diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..c3071ee
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1,3 @@
+smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch
+genirq-affinity-make-affinity-setting-if-activated-opt-in.patch
+genirq-pm-always-unlock-irq-descriptor-in-rearm_wake_irq.patch

diff --git a/queue-5.7/series b/queue-5.7/series
new file mode 100644 (file)
index 0000000..c3071ee
--- /dev/null
+++ b/queue-5.7/series
@@ -0,0 +1,3 @@
+smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch
+genirq-affinity-make-affinity-setting-if-activated-opt-in.patch
+genirq-pm-always-unlock-irq-descriptor-in-rearm_wake_irq.patch