5.15-stable patches

added patches:
	perf-machine-use-path__join-to-compose-a-path-instead-of-snprintf-dir-filename.patch

diff --git a/queue-5.15/perf-machine-use-path__join-to-compose-a-path-instead-of-snprintf-dir-filename.patch b/queue-5.15/perf-machine-use-path__join-to-compose-a-path-instead-of-snprintf-dir-filename.patch
new file mode 100644 (file)
index 0000000..6df6c83
--- /dev/null
+++ b/queue-5.15/perf-machine-use-path__join-to-compose-a-path-instead-of-snprintf-dir-filename.patch
@@ -0,0 +1,68 @@
+From 9d5f0c36438eeae7566ca383b2b673179e3cc613 Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+Date: Tue, 18 Jan 2022 09:02:43 -0300
+Subject: perf machine: Use path__join() to compose a path instead of snprintf(dir, '/', filename)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Arnaldo Carvalho de Melo <acme@redhat.com>
+
+commit 9d5f0c36438eeae7566ca383b2b673179e3cc613 upstream.
+
+Its more intention revealing, and if we're interested in the odd cases
+where this may end up truncating we can do debug checks at one
+centralized place.
+
+Motivation, of all the container builds, fedora rawhide started
+complaining of:
+
+  util/machine.c: In function ‘machine__create_modules’:
+  util/machine.c:1419:50: error: ‘%s’ directive output may be truncated writing up to 255 bytes into a region of size between 0 and 4095 [-Werror=format-truncation=]
+   1419 |                 snprintf(path, sizeof(path), "%s/%s", dir_name, dent->d_name);
+        |                                                  ^~
+  In file included from /usr/include/stdio.h:894,
+                   from util/branch.h:9,
+                   from util/callchain.h:8,
+                   from util/machine.c:7:
+  In function ‘snprintf’,
+      inlined from ‘maps__set_modules_path_dir’ at util/machine.c:1419:3,
+      inlined from ‘machine__set_modules_path’ at util/machine.c:1473:9,
+      inlined from ‘machine__create_modules’ at util/machine.c:1519:7:
+  /usr/include/bits/stdio2.h:71:10: note: ‘__builtin___snprintf_chk’ output between 2 and 4352 bytes into a destination of size 4096
+
+There are other places where we should use path__join(), but lets get rid of
+this one first.
+
+Cc: Adrian Hunter <adrian.hunter@intel.com>
+Cc: Ian Rogers <irogers@google.com>
+Cc: Jiri Olsa <jolsa@kernel.org>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Acked-by: Ian Rogers <irogers@google.com>
+Link: Link: https://lore.kernel.org/r/YebZKjwgfdOz0lAs@kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/util/machine.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/tools/perf/util/machine.c
++++ b/tools/perf/util/machine.c
+@@ -16,6 +16,7 @@
+ #include "map_symbol.h"
+ #include "branch.h"
+ #include "mem-events.h"
++#include "path.h"
+ #include "srcline.h"
+ #include "symbol.h"
+ #include "sort.h"
+@@ -1407,7 +1408,7 @@ static int maps__set_modules_path_dir(st
+               struct stat st;
+ 
+               /*sshfs might return bad dent->d_type, so we have to stat*/
+-              snprintf(path, sizeof(path), "%s/%s", dir_name, dent->d_name);
++              path__join(path, sizeof(path), dir_name, dent->d_name);
+               if (stat(path, &st))
+                       continue;
+ 

diff --git a/queue-5.15/series b/queue-5.15/series
index 0e917da1224f5c78923526924563d88d87f01620..28c3f692e1671fc1704a715a39fc9e0ffb7f695c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -117,3 +117,4 @@ arm64-bti-disable-in-kernel-bti-when-cross-section-thunks-are-broken.patch
 iommu-vt-d-correctly-calculate-sagaw-value-of-iommu.patch
 arm64-errata-add-detection-for-amevcntr01-incrementing-incorrectly.patch
 drm-bridge-display-connector-implement-bus-fmts-callbacks.patch
+perf-machine-use-path__join-to-compose-a-path-instead-of-snprintf-dir-filename.patch