From: <gregkh@linuxfoundation.org>
To: greg@kroah.com, gregkh@linuxfoundation.org,
linuxppc-dev@ozlabs.org, mpe@ellerman.id.au, tglx@linutronix.de
Cc: <stable-commits@vger.kernel.org>
Subject: Patch "powerpc/64s: Move cpu_show_meltdown()" has been added to the 4.16-stable tree
Date: Wed, 23 May 2018 19:23:12 +0200 [thread overview]
Message-ID: <152709619210929@kroah.com> (raw)
In-Reply-To: <20180522144125.10345-7-mpe@ellerman.id.au>
This is a note to let you know that I've just added the patch titled
powerpc/64s: Move cpu_show_meltdown()
to the 4.16-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:
powerpc-64s-move-cpu_show_meltdown.patch
and it can be found in the queue-4.16 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 Wed May 23 19:18:22 CEST 2018
From: Michael Ellerman <mpe@ellerman.id.au>
Date: Wed, 23 May 2018 00:41:17 +1000
Subject: powerpc/64s: Move cpu_show_meltdown()
To: greg@kroah.com
Cc: stable@vger.kernel.org, tglx@linutronix.de, linuxppc-dev@ozlabs.org
Message-ID: <20180522144125.10345-7-mpe@ellerman.id.au>
From: Michael Ellerman <mpe@ellerman.id.au>
commit 8ad33041563a10b34988800c682ada14b2612533 upstream.
This landed in setup_64.c for no good reason other than we had nowhere
else to put it. Now that we have a security-related file, that is a
better place for it so move it.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/kernel/security.c | 11 +++++++++++
arch/powerpc/kernel/setup_64.c | 8 --------
2 files changed, 11 insertions(+), 8 deletions(-)
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -5,6 +5,8 @@
// Copyright 2018, Michael Ellerman, IBM Corporation.
#include <linux/kernel.h>
+#include <linux/device.h>
+
#include <asm/security_features.h>
@@ -13,3 +15,12 @@ unsigned long powerpc_security_features
SEC_FTR_L1D_FLUSH_PR | \
SEC_FTR_BNDS_CHK_SPEC_BAR | \
SEC_FTR_FAVOUR_SECURITY;
+
+
+ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ if (rfi_flush)
+ return sprintf(buf, "Mitigation: RFI Flush\n");
+
+ return sprintf(buf, "Vulnerable\n");
+}
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -927,12 +927,4 @@ static __init int rfi_flush_debugfs_init
}
device_initcall(rfi_flush_debugfs_init);
#endif
-
-ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)
-{
- if (rfi_flush)
- return sprintf(buf, "Mitigation: RFI Flush\n");
-
- return sprintf(buf, "Vulnerable\n");
-}
#endif /* CONFIG_PPC_BOOK3S_64 */
Patches currently in stable-queue which might be from mpe@ellerman.id.au are
queue-4.16/powerpc-pseries-fix-clearing-of-security-feature-flags.patch
queue-4.16/powerpc-powernv-set-or-clear-security-feature-flags.patch
queue-4.16/powerpc-64s-move-cpu_show_meltdown.patch
queue-4.16/powerpc-pseries-set-or-clear-security-feature-flags.patch
queue-4.16/powerpc-move-default-security-feature-flags.patch
queue-4.16/powerpc-powernv-use-the-security-flags-in-pnv_setup_rfi_flush.patch
queue-4.16/powerpc-add-security-feature-flags-for-spectre-meltdown.patch
queue-4.16/powerpc-pseries-use-the-security-flags-in-pseries_setup_rfi_flush.patch
queue-4.16/powerpc-64s-enhance-the-information-in-cpu_show_meltdown.patch
queue-4.16/powerpc-rfi-flush-always-enable-fallback-flush-on-pseries.patch
queue-4.16/powerpc-pseries-add-new-h_get_cpu_characteristics-flags.patch
queue-4.16/powerpc-64s-add-support-for-a-store-forwarding-barrier-at-kernel-entry-exit.patch
queue-4.16/powerpc-64s-wire-up-cpu_show_spectre_v1.patch
queue-4.16/powerpc-64s-wire-up-cpu_show_spectre_v2.patch
next prev parent reply other threads:[~2018-05-23 17:23 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-22 14:41 [PATCH stable 4.16 00/14] powerpc backports for 4.16 Michael Ellerman
2018-05-22 14:41 ` [PATCH stable 4.16 01/14] powerpc/rfi-flush: Always enable fallback flush on pseries Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/rfi-flush: Always enable fallback flush on pseries" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 02/14] powerpc: Add security feature flags for Spectre/Meltdown Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc: Add security feature flags for Spectre/Meltdown" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 03/14] powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 04/14] powerpc/pseries: Set or clear security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Set or clear security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 05/14] powerpc/powernv: Set or clear security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/powernv: Set or clear security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 06/14] powerpc/64s: Move cpu_show_meltdown() Michael Ellerman
2018-05-23 17:23 ` gregkh [this message]
2018-05-22 14:41 ` [PATCH stable 4.16 07/14] powerpc/64s: Enhance the information in cpu_show_meltdown() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Enhance the information in cpu_show_meltdown()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 08/14] powerpc/powernv: Use the security flags in pnv_setup_rfi_flush() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 09/14] powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Use the security flags in pseries_setup_rfi_flush()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 10/14] powerpc/64s: Wire up cpu_show_spectre_v1() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v1()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 11/14] powerpc/64s: Wire up cpu_show_spectre_v2() Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v2()" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 12/14] powerpc/pseries: Fix clearing of security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/pseries: Fix clearing of security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 13/14] powerpc: Move default security feature flags Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc: Move default security feature flags" has been added to the 4.16-stable tree gregkh
2018-05-22 14:41 ` [PATCH stable 4.16 14/14] powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit Michael Ellerman
2018-05-23 17:23 ` Patch "powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit" has been added to the 4.16-stable tree gregkh
2018-05-23 17:21 ` [PATCH stable 4.16 00/14] powerpc backports for 4.16 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=152709619210929@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=greg@kroah.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=stable-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
/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).