4.14-stable patches

added patches:
	documentation-add-nospectre_v1-parameter.patch
	powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch

diff --git a/queue-4.14/documentation-add-nospectre_v1-parameter.patch b/queue-4.14/documentation-add-nospectre_v1-parameter.patch
new file mode 100644 (file)
index 0000000..56e5f5d
--- /dev/null
+++ b/queue-4.14/documentation-add-nospectre_v1-parameter.patch
@@ -0,0 +1,32 @@
+From 26cb1f36c43ee6e89d2a9f48a5a7500d5248f836 Mon Sep 17 00:00:00 2001
+From: Diana Craciun <diana.craciun@nxp.com>
+Date: Sat, 28 Jul 2018 09:06:39 +1000
+Subject: Documentation: Add nospectre_v1 parameter
+
+From: Diana Craciun <diana.craciun@nxp.com>
+
+commit 26cb1f36c43ee6e89d2a9f48a5a7500d5248f836 upstream.
+
+Currently only supported on powerpc.
+
+Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/admin-guide/kernel-parameters.txt |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -2680,6 +2680,10 @@
+                       nosmt=force: Force disable SMT, cannot be undone
+                                    via the sysfs control file.
+ 
++      nospectre_v1    [PPC] Disable mitigations for Spectre Variant 1 (bounds
++                      check bypass). With this option data leaks are possible
++                      in the system.
++
+       nospectre_v2    [X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2
+                       (indirect branch prediction) vulnerability. System may
+                       allow data leaks with this option, which is equivalent

diff --git a/queue-4.14/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch b/queue-4.14/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch
new file mode 100644 (file)
index 0000000..5640c1b
--- /dev/null
+++ b/queue-4.14/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch
@@ -0,0 +1,28 @@
+From e59f5bd759b7dee57593c5b6c0441609bda5d530 Mon Sep 17 00:00:00 2001
+From: Diana Craciun <diana.craciun@nxp.com>
+Date: Wed, 12 Dec 2018 16:03:10 +0200
+Subject: powerpc/fsl: Add FSL_PPC_BOOK3E as supported arch for nospectre_v2 boot arg
+
+From: Diana Craciun <diana.craciun@nxp.com>
+
+commit e59f5bd759b7dee57593c5b6c0441609bda5d530 upstream.
+
+Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/admin-guide/kernel-parameters.txt |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -2680,7 +2680,7 @@
+                       nosmt=force: Force disable SMT, cannot be undone
+                                    via the sysfs control file.
+ 
+-      nospectre_v2    [X86] Disable all mitigations for the Spectre variant 2
++      nospectre_v2    [X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2
+                       (indirect branch prediction) vulnerability. System may
+                       allow data leaks with this option, which is equivalent
+                       to spectre_v2=off.

diff --git a/queue-4.14/series b/queue-4.14/series
index 37a11cf419237b4c8ec5892a6ba08667272b9b05..f6340f1aa9c6b63381d43d10fd115576b0b146d3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -51,3 +51,5 @@ team-fix-possible-recursive-locking-when-add-slaves.patch
 net-rose-convert-timers-to-use-timer_setup.patch
 net-rose-fix-unbound-loop-in-rose_loopback_timer.patch
 ipv4-set-the-tcp_min_rtt_wlen-range-from-0-to-one-day.patch
+powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch
+documentation-add-nospectre_v1-parameter.patch