diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0018-perf-x86-cstate-Fix-possible-Spectre-v1-indexing-for.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0018-perf-x86-cstate-Fix-possible-Spectre-v1-indexing-for.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0018-perf-x86-cstate-Fix-possible-Spectre-v1-indexing-for.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0018-perf-x86-cstate-Fix-possible-Spectre-v1-indexing-for.patch deleted file mode 100644 index 40bc2cae..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0018-perf-x86-cstate-Fix-possible-Spectre-v1-indexing-for.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8708c762c727c3c4a8fb6c75fc1d5585f89ece90 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra <peterz@infradead.org> -Date: Fri, 20 Apr 2018 14:25:48 +0200 -Subject: [PATCH 18/93] perf/x86/cstate: Fix possible Spectre-v1 indexing for - pkg_msr - -commit a5f81290ce475489fa2551c01a07470c1a4c932e upstream. - -> arch/x86/events/intel/cstate.c:307 cstate_pmu_event_init() warn: potential spectre issue 'pkg_msr' (local cap) - -Userspace controls @attr, sanitize cfg (attr->config) before using it -to index an array. - -Reported-by: Dan Carpenter <dan.carpenter@oracle.com> -Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> -Cc: <stable@kernel.org> -Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> -Cc: Arnaldo Carvalho de Melo <acme@redhat.com> -Cc: Jiri Olsa <jolsa@redhat.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Stephane Eranian <eranian@google.com> -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: Vince Weaver <vincent.weaver@maine.edu> -Signed-off-by: Ingo Molnar <mingo@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/events/intel/cstate.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c -index fec8a46..c6a04c0 100644 ---- a/arch/x86/events/intel/cstate.c -+++ b/arch/x86/events/intel/cstate.c -@@ -90,6 +90,7 @@ - #include <linux/module.h> - #include <linux/slab.h> - #include <linux/perf_event.h> -+#include <linux/nospec.h> - #include <asm/cpu_device_id.h> - #include <asm/intel-family.h> - #include "../perf_event.h" -@@ -300,6 +301,7 @@ static int cstate_pmu_event_init(struct perf_event *event) - } else if (event->pmu == &cstate_pkg_pmu) { - if (cfg >= PERF_CSTATE_PKG_EVENT_MAX) - return -EINVAL; -+ cfg = array_index_nospec((unsigned long)cfg, PERF_CSTATE_PKG_EVENT_MAX); - if (!pkg_msr[cfg].attr) - return -EINVAL; - event->hw.event_base = pkg_msr[cfg].msr; --- -2.7.4 - |