4.9-stable patches

added patches:
	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 (file)
index 0000000..981cccb
--- /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 <adrian.hunter@intel.com>
+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 <adrian.hunter@intel.com>
+
+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 <adrian.hunter@intel.com>
+Acked-by: Namhyung Kim <namhyung@kernel.org>
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+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 <acme@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 542adcdd15d2fe0ba37cd4316979a25d20bf203b..ab8956231264965f49d3e0c8624d953c5ad2949d 100644 (file)
--- 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