From 765cf23cfe0502f7308cf812c16ebc4a659408e5 Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: May 02 2023 07:33:36 +0000 Subject: x86/bugs: Add Cannon lake to RETBleed affected CPU list (git-fixes). Signed-off-by: Nikolay Borisov --- diff --git a/patches.suse/x86-bugs-add-cannon-lake-to-retbleed-affected-cpu-list.patch b/patches.suse/x86-bugs-add-cannon-lake-to-retbleed-affected-cpu-list.patch new file mode 100644 index 0000000..1bc7367 --- /dev/null +++ b/patches.suse/x86-bugs-add-cannon-lake-to-retbleed-affected-cpu-list.patch @@ -0,0 +1,27 @@ +From: Pawan Gupta +Date: Wed, 6 Jul 2022 15:01:15 -0700 +Subject: x86/bugs: Add Cannon lake to RETBleed affected CPU list +Git-commit: f54d45372c6ac9c993451de5e51312485f7d10bc +Patch-mainline: v5.19-rc7 +References: git-fixes + +Cannon lake is also affected by RETBleed, add it to the list. + +Fixes: 6ad0ad2bf8a6 ("x86/bugs: Report Intel retbleed vulnerability") +Signed-off-by: Pawan Gupta +Signed-off-by: Borislav Petkov +Acked-by: Nikolay Borisov +--- + arch/x86/kernel/cpu/common.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/kernel/cpu/common.c ++++ b/arch/x86/kernel/cpu/common.c +@@ -1034,6 +1034,7 @@ static const struct x86_cpu_id cpu_vuln_ + VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), + VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), + VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), ++ VULNBL_INTEL_STEPPINGS(CANNONLAKE_L, X86_STEPPING_ANY, RETBLEED), + VULNBL_INTEL_STEPPINGS(ICELAKE_L, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), + VULNBL_INTEL_STEPPINGS(ICELAKE_XEON_D, X86_STEPPING_ANY, MMIO), + VULNBL_INTEL_STEPPINGS(ICELAKE_X, X86_STEPPING_ANY, MMIO), diff --git a/series.conf b/series.conf index 60f2407..72e0685 100644 --- a/series.conf +++ b/series.conf @@ -62745,6 +62745,7 @@ patches.suse/x86-common-Stamp-out-the-stepping-madness.patch patches.suse/x86-cpu-amd-Enumerate-BTC_NO.patch patches.suse/x86-retbleed-add-fine-grained-kconfig-knobs.patch + patches.suse/x86-bugs-add-cannon-lake-to-retbleed-affected-cpu-list.patch patches.suse/x86-bugs-Do-not-enable-IBPB-on-entry-when-IBPB-is-no.patch patches.suse/x86-kexec-disable-ret-on-kexec.patch patches.suse/x86-speculation-Disable-RRSBA-behavior.patch