From: Greg Kroah-Hartman Date: Tue, 30 Apr 2019 13:25:35 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.9.172~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad99ec7c22d2cb10f8e956b01bdfc3800a1aa720;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-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.4/documentation-add-nospectre_v1-parameter.patch b/queue-4.4/documentation-add-nospectre_v1-parameter.patch new file mode 100644 index 00000000000..027a791fa57 --- /dev/null +++ b/queue-4.4/documentation-add-nospectre_v1-parameter.patch @@ -0,0 +1,32 @@ +From 26cb1f36c43ee6e89d2a9f48a5a7500d5248f836 Mon Sep 17 00:00:00 2001 +From: Diana Craciun +Date: Sat, 28 Jul 2018 09:06:39 +1000 +Subject: Documentation: Add nospectre_v1 parameter + +From: Diana Craciun + +commit 26cb1f36c43ee6e89d2a9f48a5a7500d5248f836 upstream. + +Currently only supported on powerpc. + +Signed-off-by: Diana Craciun +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/kernel-parameters.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -2450,6 +2450,10 @@ bytes respectively. Such letter suffixes + + nohugeiomap [KNL,x86] Disable kernel huge I/O mappings. + ++ 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.4/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch b/queue-4.4/powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch new file mode 100644 index 00000000000..72c85326432 --- /dev/null +++ b/queue-4.4/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 +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 + +commit e59f5bd759b7dee57593c5b6c0441609bda5d530 upstream. + +Signed-off-by: Diana Craciun +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/kernel-parameters.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -2450,7 +2450,7 @@ bytes respectively. Such letter suffixes + + nohugeiomap [KNL,x86] Disable kernel huge I/O mappings. + +- 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.4/series b/queue-4.4/series index b6cb5667233..763c76d98b5 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -82,3 +82,5 @@ powerpc-fsl-emulate-sprn_bucsr-register.patch powerpc-fsl-flush-the-branch-predictor-at-each-kernel-entry-32-bit.patch powerpc-fsl-sanitize-the-syscall-table-for-nxp-powerpc-32-bit-platforms.patch powerpc-fsl-fixed-warning-orphan-section-__btb_flush_fixup.patch +powerpc-fsl-add-fsl_ppc_book3e-as-supported-arch-for-nospectre_v2-boot-arg.patch +documentation-add-nospectre_v1-parameter.patch