From: Greg Kroah-Hartman Date: Mon, 3 Sep 2018 13:06:39 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v3.18.121~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44d45b0085965146a46f6dbeccf336c0cf0f9789;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: x86-irqflags-mark-native_restore_fl-extern-inline.patch x86-spectre-add-missing-family-6-check-to-microcode-check.patch --- diff --git a/queue-4.4/series b/queue-4.4/series index 3201a8e7e5b..a79f4787fa6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -66,3 +66,5 @@ udl-kms-fix-crash-due-to-uninitialized-memory.patch asoc-dpcm-don-t-merge-format-from-invalid-codec-dai.patch asoc-sirf-fix-potential-null-pointer-dereference.patch pinctrl-freescale-off-by-one-in-imx1_pinconf_group_dbg_show.patch +x86-irqflags-mark-native_restore_fl-extern-inline.patch +x86-spectre-add-missing-family-6-check-to-microcode-check.patch diff --git a/queue-4.4/x86-irqflags-mark-native_restore_fl-extern-inline.patch b/queue-4.4/x86-irqflags-mark-native_restore_fl-extern-inline.patch new file mode 100644 index 00000000000..fb6b2646665 --- /dev/null +++ b/queue-4.4/x86-irqflags-mark-native_restore_fl-extern-inline.patch @@ -0,0 +1,40 @@ +From 1f59a4581b5ecfe9b4f049a7a2cf904d8352842d Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Mon, 27 Aug 2018 14:40:09 -0700 +Subject: x86/irqflags: Mark native_restore_fl extern inline + +From: Nick Desaulniers + +commit 1f59a4581b5ecfe9b4f049a7a2cf904d8352842d upstream. + +This should have been marked extern inline in order to pick up the out +of line definition in arch/x86/kernel/irqflags.S. + +Fixes: 208cbb325589 ("x86/irqflags: Provide a declaration for native_save_fl") +Reported-by: Ben Hutchings +Signed-off-by: Nick Desaulniers +Signed-off-by: Thomas Gleixner +Reviewed-by: Juergen Gross +Cc: "H. Peter Anvin" +Cc: Boris Ostrovsky +Cc: Greg Kroah-Hartman +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20180827214011.55428-1-ndesaulniers@google.com +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/include/asm/irqflags.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/x86/include/asm/irqflags.h ++++ b/arch/x86/include/asm/irqflags.h +@@ -28,7 +28,8 @@ extern inline unsigned long native_save_ + return flags; + } + +-static inline void native_restore_fl(unsigned long flags) ++extern inline void native_restore_fl(unsigned long flags); ++extern inline void native_restore_fl(unsigned long flags) + { + asm volatile("push %0 ; popf" + : /* no output */ diff --git a/queue-4.4/x86-spectre-add-missing-family-6-check-to-microcode-check.patch b/queue-4.4/x86-spectre-add-missing-family-6-check-to-microcode-check.patch new file mode 100644 index 00000000000..7a241c839e7 --- /dev/null +++ b/queue-4.4/x86-spectre-add-missing-family-6-check-to-microcode-check.patch @@ -0,0 +1,39 @@ +From 1ab534e85c93945f7862378d8c8adcf408205b19 Mon Sep 17 00:00:00 2001 +From: Andi Kleen +Date: Fri, 24 Aug 2018 10:03:51 -0700 +Subject: x86/spectre: Add missing family 6 check to microcode check + +From: Andi Kleen + +commit 1ab534e85c93945f7862378d8c8adcf408205b19 upstream. + +The check for Spectre microcodes does not check for family 6, only the +model numbers. + +Add a family 6 check to avoid ambiguity with other families. + +Fixes: a5b296636453 ("x86/cpufeature: Blacklist SPEC_CTRL/PRED_CMD on early Spectre v2 microcodes") +Signed-off-by: Andi Kleen +Signed-off-by: Thomas Gleixner +Cc: x86@kernel.org +Cc: linux-kernel@vger.kernel.org +Cc: stable@vger.kernel.org +Link: https://lkml.kernel.org/r/20180824170351.34874-2-andi@firstfloor.org +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/cpu/intel.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/x86/kernel/cpu/intel.c ++++ b/arch/x86/kernel/cpu/intel.c +@@ -74,6 +74,9 @@ static bool bad_spectre_microcode(struct + if (cpu_has(c, X86_FEATURE_HYPERVISOR)) + return false; + ++ if (c->x86 != 6) ++ return false; ++ + for (i = 0; i < ARRAY_SIZE(spectre_bad_microcodes); i++) { + if (c->x86_model == spectre_bad_microcodes[i].model && + c->x86_mask == spectre_bad_microcodes[i].stepping)