]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Oct 2019 21:34:16 +0000 (14:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Oct 2019 21:34:16 +0000 (14:34 -0700)
added patches:
perf-hw_breakpoint-fix-arch_hw_breakpoint-use-before-initialization.patch

queue-4.19/perf-hw_breakpoint-fix-arch_hw_breakpoint-use-before-initialization.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/perf-hw_breakpoint-fix-arch_hw_breakpoint-use-before-initialization.patch b/queue-4.19/perf-hw_breakpoint-fix-arch_hw_breakpoint-use-before-initialization.patch
new file mode 100644 (file)
index 0000000..22b7d06
--- /dev/null
@@ -0,0 +1,60 @@
+From 310aa0a25b338b3100c94880c9a69bec8ce8c3ae Mon Sep 17 00:00:00 2001
+From: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
+Date: Fri, 6 Sep 2019 14:01:16 +0800
+Subject: perf/hw_breakpoint: Fix arch_hw_breakpoint use-before-initialization
+
+From: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
+
+commit 310aa0a25b338b3100c94880c9a69bec8ce8c3ae upstream.
+
+If we disable the compiler's auto-initialization feature, if
+-fplugin-arg-structleak_plugin-byref or -ftrivial-auto-var-init=pattern
+are disabled, arch_hw_breakpoint may be used before initialization after:
+
+  9a4903dde2c86 ("perf/hw_breakpoint: Split attribute parse and commit")
+
+On our ARM platform, the struct step_ctrl in arch_hw_breakpoint, which
+used to be zero-initialized by kzalloc(), may be used in
+arch_install_hw_breakpoint() without initialization.
+
+Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Alix Wu <alix.wu@mediatek.com>
+Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: YJ Chiang <yj.chiang@mediatek.com>
+Link: https://lkml.kernel.org/r/20190906060115.9460-1-mark-pk.tsai@mediatek.com
+[ Minor edits. ]
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Cc: Doug Anderson <dianders@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/events/hw_breakpoint.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/events/hw_breakpoint.c
++++ b/kernel/events/hw_breakpoint.c
+@@ -426,7 +426,7 @@ static int hw_breakpoint_parse(struct pe
+ int register_perf_hw_breakpoint(struct perf_event *bp)
+ {
+-      struct arch_hw_breakpoint hw;
++      struct arch_hw_breakpoint hw = { };
+       int err;
+       err = reserve_bp_slot(bp);
+@@ -474,7 +474,7 @@ int
+ modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *attr,
+                               bool check)
+ {
+-      struct arch_hw_breakpoint hw;
++      struct arch_hw_breakpoint hw = { };
+       int err;
+       err = hw_breakpoint_parse(bp, attr, &hw);
index 5a6372698efbdc321e1ba177b6c93caa260a3484..f19f9c0fd8a4cd7e2877352cf7c317b5bf707bee 100644 (file)
@@ -78,3 +78,4 @@ tracing-get-trace_array-reference-for-available_tracers-files.patch
 hwmon-fix-hwmon_p_min_alarm-mask.patch
 x86-asm-fix-mwaitx-c-state-hint-value.patch
 pci-vmd-fix-config-addressing-when-using-bus-offsets.patch
+perf-hw_breakpoint-fix-arch_hw_breakpoint-use-before-initialization.patch