From f8e69c65fbb8b267b95d2880af4b0df1e2c3134f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Oct 2022 07:24:36 +0200 Subject: [PATCH] 4.9-stable patches added patches: perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch --- ...t-in-intel_pt_print_info-with-uclibc.patch | 56 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 57 insertions(+) create mode 100644 queue-4.9/perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch diff --git a/queue-4.9/perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch b/queue-4.9/perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch new file mode 100644 index 00000000000..981cccb9974 --- /dev/null +++ b/queue-4.9/perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch @@ -0,0 +1,56 @@ +From 5a3d47071f0ced0431ef82a5fb6bd077ed9493db Mon Sep 17 00:00:00 2001 +From: Adrian Hunter +Date: Wed, 12 Oct 2022 11:22:58 +0300 +Subject: perf intel-pt: Fix segfault in intel_pt_print_info() with uClibc + +From: Adrian Hunter + +commit 5a3d47071f0ced0431ef82a5fb6bd077ed9493db upstream. + +uClibc segfaulted because NULL was passed as the format to fprintf(). + +That happened because one of the format strings was missing and +intel_pt_print_info() didn't check that before calling fprintf(). + +Add the missing format string, and check format is not NULL before calling +fprintf(). + +Fixes: 11fa7cb86b56d361 ("perf tools: Pass Intel PT information for decoding MTC and CYC") +Signed-off-by: Adrian Hunter +Acked-by: Namhyung Kim +Cc: Adrian Hunter +Cc: Ian Rogers +Cc: Jiri Olsa +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20221012082259.22394-2-adrian.hunter@intel.com +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Greg Kroah-Hartman +--- + tools/perf/util/intel-pt.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/tools/perf/util/intel-pt.c ++++ b/tools/perf/util/intel-pt.c +@@ -2124,6 +2124,7 @@ static const char * const intel_pt_info_ + [INTEL_PT_SNAPSHOT_MODE] = " Snapshot mode %"PRId64"\n", + [INTEL_PT_PER_CPU_MMAPS] = " Per-cpu maps %"PRId64"\n", + [INTEL_PT_MTC_BIT] = " MTC bit %#"PRIx64"\n", ++ [INTEL_PT_MTC_FREQ_BITS] = " MTC freq bits %#"PRIx64"\n", + [INTEL_PT_TSC_CTC_N] = " TSC:CTC numerator %"PRIu64"\n", + [INTEL_PT_TSC_CTC_D] = " TSC:CTC denominator %"PRIu64"\n", + [INTEL_PT_CYC_BIT] = " CYC bit %#"PRIx64"\n", +@@ -2138,8 +2139,12 @@ static void intel_pt_print_info(u64 *arr + if (!dump_trace) + return; + +- for (i = start; i <= finish; i++) +- fprintf(stdout, intel_pt_info_fmts[i], arr[i]); ++ for (i = start; i <= finish; i++) { ++ const char *fmt = intel_pt_info_fmts[i]; ++ ++ if (fmt) ++ fprintf(stdout, fmt, arr[i]); ++ } + } + + static void intel_pt_print_info_str(const char *name, const char *str) diff --git a/queue-4.9/series b/queue-4.9/series index 542adcdd15d..ab895623126 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -162,3 +162,4 @@ usb-host-xhci-fix-potential-memory-leak-in-xhci_allo.patch usb-musb-fix-musb_gadget.c-rxstate-overflow-bug.patch revert-usb-storage-add-quirk-for-samsung-fit-flash.patch usb-idmouse-fix-an-uninit-value-in-idmouse_open.patch +perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch -- 2.47.2