From 340c3e127e39afff62914ac81238cde41fe17c98 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Aug 2020 12:19:08 +0200 Subject: [PATCH] 4.9-stable patches added patches: smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch --- queue-4.14/series | 1 + queue-4.19/series | 2 ++ queue-4.9/series | 1 + ...nfusing-error-scenario-with-sec-krb5.patch | 35 +++++++++++++++++++ queue-5.4/series | 3 ++ queue-5.7/series | 3 ++ 6 files changed, 45 insertions(+) create mode 100644 queue-4.19/series create mode 100644 queue-4.9/smb3-warn-on-confusing-error-scenario-with-sec-krb5.patch create mode 100644 queue-5.4/series create mode 100644 queue-5.7/series diff --git a/queue-4.14/series b/queue-4.14/series index 34e9f5b904d..73138fff656 100644 --- 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 index 00000000000..3ebafee8e54 --- /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 718cce38617..fc691de9725 100644 --- 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 index 00000000000..308daec3fe6 --- /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 +Date: Thu, 16 Jul 2020 00:34:21 -0500 +Subject: smb3: warn on confusing error scenario with sec=krb5 + +From: Steve French + +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 +Signed-off-by: Steve French +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..c3071eed58f --- /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 index 00000000000..c3071eed58f --- /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 -- 2.47.3