git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From ce447a3b1adf6d52d377fc6b565ded78f4b31739 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Tue, 27 Oct 2020 12:43:57 +0300
   4 Subject: perf trace: Fix segfault when trying to trace events by cgroup
   5
   6 From: Stanislav Ivanichkin <sivanichkin@yandex-team.ru>
   7
   8 [ Upstream commit a6293f36ac92ab513771a98efe486477be2f981f ]
   9
  10   # ./perf trace -e sched:sched_switch -G test -a sleep 1
  11   perf: Segmentation fault
  12   Obtained 11 stack frames.
  13   ./perf(sighandler_dump_stack+0x43) [0x55cfdc636db3]
  14   /lib/x86_64-linux-gnu/libc.so.6(+0x3efcf) [0x7fd23eecafcf]
  15   ./perf(parse_cgroups+0x36) [0x55cfdc673f36]
  16   ./perf(+0x3186ed) [0x55cfdc70d6ed]
  17   ./perf(parse_options_subcommand+0x629) [0x55cfdc70e999]
  18   ./perf(cmd_trace+0x9c2) [0x55cfdc5ad6d2]
  19   ./perf(+0x1e8ae0) [0x55cfdc5ddae0]
  20   ./perf(+0x1e8ded) [0x55cfdc5ddded]
  21   ./perf(main+0x370) [0x55cfdc556f00]
  22   /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xe6) [0x7fd23eeadb96]
  23   ./perf(_start+0x29) [0x55cfdc557389]
  24   Segmentation fault
  25   #
  26
  27  It happens because "struct trace" in option->value is passed to the
  28  parse_cgroups function instead of "struct evlist".
  29
  30 Fixes: 9ea42ba4411ac ("perf trace: Support setting cgroups as targets")
  31 Signed-off-by: Stanislav Ivanichkin <sivanichkin@yandex-team.ru>
  32 Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  33 Acked-by: Namhyung Kim <namhyung@kernel.org>
  34 Cc: Dmitry Monakhov <dmtrmonakhov@yandex-team.ru>
  35 Link: http://lore.kernel.org/lkml/20201027094357.94881-1-sivanichkin@yandex-team.ru
  36 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  37 Signed-off-by: Sasha Levin <sashal@kernel.org>
  38 ---
  39  tools/perf/builtin-trace.c | 15 +++++++++------
  40  1 file changed, 9 insertions(+), 6 deletions(-)
  41
  42 diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
  43 index 44a75f234db17..de80534473afa 100644
  44 --- a/tools/perf/builtin-trace.c
  45 +++ b/tools/perf/builtin-trace.c
  46 @@ -4639,9 +4639,9 @@ do_concat:
  47         err = 0;
  48
  49         if (lists[0]) {
  50 -               struct option o = OPT_CALLBACK('e', "event", &trace->evlist, "event",
  51 -                                              "event selector. use 'perf list' to list available events",
  52 -                                              parse_events_option);
  53 +               struct option o = {
  54 +                       .value = &trace->evlist,
  55 +               };
  56                 err = parse_events_option(&o, lists[0], 0);
  57         }
  58  out:
  59 @@ -4655,9 +4655,12 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int u
  60  {
  61         struct trace *trace = opt->value;
  62
  63 -       if (!list_empty(&trace->evlist->core.entries))
  64 -               return parse_cgroups(opt, str, unset);
  65 -
  66 +       if (!list_empty(&trace->evlist->core.entries)) {
  67 +               struct option o = {
  68 +                       .value = &trace->evlist,
  69 +               };
  70 +               return parse_cgroups(&o, str, unset);
  71 +       }
  72         trace->cgroup = evlist__findnew_cgroup(trace->evlist, str);
  73
  74         return 0;
  75 --
  76 2.27.0
  77