linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: christophe.leroy@c-s.fr, diana.craciun@nxp.com,
	gregkh@linuxfoundation.org, linuxppc-dev@ozlabs.org,
	mpe@ellerman.id.au, msuchanek@suse.de
Cc: stable-commits@vger.kernel.org
Subject: Patch "[PATCH stable v4.14 07/32] powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2" has been added to the 4.14-stable tree
Date: Fri, 29 Mar 2019 15:54:48 +0100	[thread overview]
Message-ID: <15538712889183@kroah.com> (raw)
In-Reply-To: <20190329112620.14489-8-mpe@ellerman.id.au>


This is a note to let you know that I've just added the patch titled

    [PATCH stable v4.14 07/32] powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2

to the 4.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     powerpc64s-show-ori31-availability-in-spectre_v1-sysfs-file-not-v2.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


From foo@baz Fri Mar 29 15:53:50 CET 2019
From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 29 Mar 2019 22:25:55 +1100
Subject: [PATCH stable v4.14 07/32] powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2
To: stable@vger.kernel.org, gregkh@linuxfoundation.org
Cc: linuxppc-dev@ozlabs.org, diana.craciun@nxp.com, msuchanek@suse.de, christophe.leroy@c-s.fr
Message-ID: <20190329112620.14489-8-mpe@ellerman.id.au>

From: Michael Ellerman <mpe@ellerman.id.au>

commit 6d44acae1937b81cf8115ada8958e04f601f3f2e upstream.

When I added the spectre_v2 information in sysfs, I included the
availability of the ori31 speculation barrier.

Although the ori31 barrier can be used to mitigate v2, it's primarily
intended as a spectre v1 mitigation. Spectre v2 is mitigated by
hardware changes.

So rework the sysfs files to show the ori31 information in the
spectre_v1 file, rather than v2.

Currently we display eg:

  $ grep . spectre_v*
  spectre_v1:Mitigation: __user pointer sanitization
  spectre_v2:Mitigation: Indirect branch cache disabled, ori31 speculation barrier enabled

After:

  $ grep . spectre_v*
  spectre_v1:Mitigation: __user pointer sanitization, ori31 speculation barrier enabled
  spectre_v2:Mitigation: Indirect branch cache disabled

Fixes: d6fbe1c55c55 ("powerpc/64s: Wire up cpu_show_spectre_v2()")
Cc: stable@vger.kernel.org # v4.17+
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/powerpc/kernel/security.c |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -117,25 +117,35 @@ ssize_t cpu_show_meltdown(struct device
 
 ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf)
 {
-	if (!security_ftr_enabled(SEC_FTR_BNDS_CHK_SPEC_BAR))
-		return sprintf(buf, "Not affected\n");
+	struct seq_buf s;
+
+	seq_buf_init(&s, buf, PAGE_SIZE - 1);
+
+	if (security_ftr_enabled(SEC_FTR_BNDS_CHK_SPEC_BAR)) {
+		if (barrier_nospec_enabled)
+			seq_buf_printf(&s, "Mitigation: __user pointer sanitization");
+		else
+			seq_buf_printf(&s, "Vulnerable");
 
-	if (barrier_nospec_enabled)
-		return sprintf(buf, "Mitigation: __user pointer sanitization\n");
+		if (security_ftr_enabled(SEC_FTR_SPEC_BAR_ORI31))
+			seq_buf_printf(&s, ", ori31 speculation barrier enabled");
 
-	return sprintf(buf, "Vulnerable\n");
+		seq_buf_printf(&s, "\n");
+	} else
+		seq_buf_printf(&s, "Not affected\n");
+
+	return s.len;
 }
 
 ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, char *buf)
 {
-	bool bcs, ccd, ori;
 	struct seq_buf s;
+	bool bcs, ccd;
 
 	seq_buf_init(&s, buf, PAGE_SIZE - 1);
 
 	bcs = security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED);
 	ccd = security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED);
-	ori = security_ftr_enabled(SEC_FTR_SPEC_BAR_ORI31);
 
 	if (bcs || ccd) {
 		seq_buf_printf(&s, "Mitigation: ");
@@ -151,9 +161,6 @@ ssize_t cpu_show_spectre_v2(struct devic
 	} else
 		seq_buf_printf(&s, "Vulnerable");
 
-	if (ori)
-		seq_buf_printf(&s, ", ori31 speculation barrier enabled");
-
 	seq_buf_printf(&s, "\n");
 
 	return s.len;


Patches currently in stable-queue which might be from mpe@ellerman.id.au are

queue-4.14/powerpc-fsl-emulate-sprn_bucsr-register.patch
queue-4.14/powerpc-64-make-stf-barrier-ppc_book3s_64-specific.patch
queue-4.14/powerpc-fsl-fix-spectre_v2-mitigations-reporting.patch
queue-4.14/powerpc-64s-patch-barrier_nospec-in-modules.patch
queue-4.14/powerpc-pseries-query-hypervisor-for-count-cache-flush-settings.patch
queue-4.14/powerpc-64s-add-support-for-software-count-cache-flush.patch
queue-4.14/powerpc64s-show-ori31-availability-in-spectre_v1-sysfs-file-not-v2.patch
queue-4.14/powerpc-fsl-flush-the-branch-predictor-at-each-kernel-entry-64bit.patch
queue-4.14/powerpc-fsl-update-spectre-v2-reporting.patch
queue-4.14/powerpc-64-make-meltdown-reporting-book3s-64-specific.patch
queue-4.14/powerpc-64s-add-support-for-ori-barrier_nospec-patching.patch
queue-4.14/powerpc-use-barrier_nospec-in-copy_from_user.patch
queue-4.14/powerpc-fsl-sanitize-the-syscall-table-for-nxp-powerpc-32-bit-platforms.patch
queue-4.14/powerpc-fsl-add-macro-to-flush-the-branch-predictor.patch
queue-4.14/powerpc-fsl-add-barrier_nospec-implementation-for-nxp-powerpc-book3e.patch
queue-4.14/powerpc-security-fix-spectre_v2-reporting.patch
queue-4.14/powerpc-64-disable-the-speculation-barrier-from-the-command-line.patch
queue-4.14/powerpc-fsl-fix-the-flush-of-branch-predictor.patch
queue-4.14/powerpc-64-add-config_ppc_barrier_nospec.patch
queue-4.14/powerpc-fsl-enable-runtime-patching-if-nospectre_v2-boot-arg-is-used.patch
queue-4.14/powerpc-64-use-barrier_nospec-in-syscall-entry.patch
queue-4.14/powerpc-fsl-fixed-warning-orphan-section-__btb_flush_fixup.patch
queue-4.14/powerpc-fsl-add-nospectre_v2-command-line-argument.patch
queue-4.14/powerpc-64s-add-new-security-feature-flags-for-count-cache-flush.patch
queue-4.14/powerpc-fsl-add-infrastructure-to-fixup-branch-predictor-flush.patch
queue-4.14/powerpc-64s-enhance-the-information-in-cpu_show_spectre_v1.patch
queue-4.14/powerpc-64-call-setup_barrier_nospec-from-setup_arch.patch
queue-4.14/powerpc-asm-add-a-patch_site-macro-helpers-for-patching-instructions.patch
queue-4.14/powerpc-fsl-flush-the-branch-predictor-at-each-kernel-entry-32-bit.patch
queue-4.14/powerpc-64s-enable-barrier_nospec-based-on-firmware-settings.patch
queue-4.14/powerpc-fsl-flush-branch-predictor-when-entering-kvm.patch
queue-4.14/powerpc-powernv-query-firmware-for-count-cache-flush-settings.patch

  reply	other threads:[~2019-03-29 15:51 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-29 11:25 [PATCH stable v4.14 00/32] powerpc spectre backports for 4.14 Michael Ellerman
2019-03-29 11:25 ` [PATCH stable v4.14 01/32] powerpc/64s: Add support for ori barrier_nospec patching Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 01/32] powerpc/64s: Add support for ori barrier_nospec patching" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 02/32] powerpc/64s: Patch barrier_nospec in modules Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 02/32] powerpc/64s: Patch barrier_nospec in modules" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 03/32] powerpc/64s: Enable barrier_nospec based on firmware settings Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 03/32] powerpc/64s: Enable barrier_nospec based on firmware settings" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 04/32] powerpc: Use barrier_nospec in copy_from_user() Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 04/32] powerpc: Use barrier_nospec in copy_from_user()" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 05/32] powerpc/64: Use barrier_nospec in syscall entry Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 05/32] powerpc/64: Use barrier_nospec in syscall entry" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 06/32] powerpc/64s: Enhance the information in cpu_show_spectre_v1() Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 06/32] powerpc/64s: Enhance the information in cpu_show_spectre_v1()" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 07/32] powerpc64s: Show ori31 availability in spectre_v1 sysfs file not v2 Michael Ellerman
2019-03-29 14:54   ` gregkh [this message]
2019-03-29 11:25 ` [PATCH stable v4.14 08/32] powerpc/64: Disable the speculation barrier from the command line Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 08/32] powerpc/64: Disable the speculation barrier from the command line" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 09/32] powerpc/64: Make stf barrier PPC_BOOK3S_64 specific Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 09/32] powerpc/64: Make stf barrier PPC_BOOK3S_64 specific." has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 10/32] powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 10/32] powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC" has been added to the 4.14-stable tree gregkh
2019-03-29 11:25 ` [PATCH stable v4.14 11/32] powerpc/64: Call setup_barrier_nospec() from setup_arch() Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 11/32] powerpc/64: Call setup_barrier_nospec() from setup_arch()" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 12/32] powerpc/64: Make meltdown reporting Book3S 64 specific Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 12/32] powerpc/64: Make meltdown reporting Book3S 64 specific" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 13/32] powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 13/32] powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E" has been added to the 4.14-stable tree gregkh
2019-03-29 16:22   ` [PATCH stable v4.14 13/32] powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E Joakim Tjernlund
2019-04-02  6:19     ` Michael Ellerman
2019-04-02  6:56       ` Joakim Tjernlund
2019-04-03  0:53         ` Michael Ellerman
2019-04-03  4:38           ` Joakim Tjernlund
2019-03-29 11:26 ` [PATCH stable v4.14 14/32] powerpc/fsl: Sanitize the syscall table for NXP PowerPC 32 bit platforms Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 14/32] powerpc/fsl: Sanitize the syscall table for NXP PowerPC 32 bit platforms" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 15/32] powerpc/asm: Add a patch_site macro & helpers for patching instructions Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 15/32] powerpc/asm: Add a patch_site macro & helpers for patching instructions" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 16/32] powerpc/64s: Add new security feature flags for count cache flush Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 16/32] powerpc/64s: Add new security feature flags for count cache flush" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 17/32] powerpc/64s: Add support for software count cache flush Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 17/32] powerpc/64s: Add support for software count cache flush" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 18/32] powerpc/pseries: Query hypervisor for count cache flush settings Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 18/32] powerpc/pseries: Query hypervisor for count cache flush settings" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 19/32] powerpc/powernv: Query firmware for count cache flush settings Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 19/32] powerpc/powernv: Query firmware for count cache flush settings" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 20/32] powerpc/fsl: Add infrastructure to fixup branch predictor flush Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 20/32] powerpc/fsl: Add infrastructure to fixup branch predictor flush" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Add infrastructure to fixup branch predictor flush" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 21/32] powerpc/fsl: Add macro to flush the branch predictor Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 21/32] powerpc/fsl: Add macro to flush the branch predictor" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Add macro to flush the branch predictor" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 22/32] powerpc/fsl: Fix spectre_v2 mitigations reporting Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 22/32] powerpc/fsl: Fix spectre_v2 mitigations reporting" has been added to the 4.14-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 23/32] powerpc/fsl: Emulate SPRN_BUCSR register Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 23/32] powerpc/fsl: Emulate SPRN_BUCSR register" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Emulate SPRN_BUCSR register" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 24/32] powerpc/fsl: Add nospectre_v2 command line argument Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 24/32] powerpc/fsl: Add nospectre_v2 command line argument" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Add nospectre_v2 command line argument" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 25/32] powerpc/fsl: Flush the branch predictor at each kernel entry (64bit) Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 25/32] powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Flush the branch predictor at each kernel entry (64bit)" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 26/32] powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit) Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 26/32] powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit)" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Flush the branch predictor at each kernel entry (32 bit)" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 27/32] powerpc/fsl: Flush branch predictor when entering KVM Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 27/32] powerpc/fsl: Flush branch predictor when entering KVM" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Flush branch predictor when entering KVM" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 28/32] powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 28/32] powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 29/32] powerpc/fsl: Update Spectre v2 reporting Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 29/32] powerpc/fsl: Update Spectre v2 reporting" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Update Spectre v2 reporting" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 30/32] powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup' Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 30/32] powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Fixed warning: orphan section `__btb_flush_fixup'" has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 31/32] powerpc/fsl: Fix the flush of branch predictor Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 31/32] powerpc/fsl: Fix the flush of branch predictor." has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/fsl: Fix the flush of branch predictor." has been added to the 4.19-stable tree gregkh
2019-03-29 11:26 ` [PATCH stable v4.14 32/32] powerpc/security: Fix spectre_v2 reporting Michael Ellerman
2019-03-29 14:54   ` Patch "[PATCH stable v4.14 32/32] powerpc/security: Fix spectre_v2 reporting" has been added to the 4.14-stable tree gregkh
2019-03-29 15:07   ` Patch "powerpc/security: Fix spectre_v2 reporting" has been added to the 4.19-stable tree gregkh
2019-03-29 14:51 ` [PATCH stable v4.14 00/32] powerpc spectre backports for 4.14 Greg KH
2019-03-29 15:09   ` Greg KH
2019-03-31  9:53     ` Michael Ellerman
2019-04-02 15:21       ` Diana Madalina Craciun
2019-04-02 15:49         ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=15538712889183@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=christophe.leroy@c-s.fr \
    --cc=diana.craciun@nxp.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=msuchanek@suse.de \
    --cc=stable-commits@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).