• Adrian Hunter's avatar
    perf inject: Fix segfault due to perf_data__fd() without open · c271a55b
    Adrian Hunter authored
    The fixed commit attempts to get the output file descriptor even if the
    file was never opened e.g.
    
      $ perf record uname
      Linux
      [ perf record: Woken up 1 times to write data ]
      [ perf record: Captured and wrote 0.002 MB perf.data (7 samples) ]
      $ perf inject -i perf.data --vm-time-correlation=dry-run
      Segmentation fault (core dumped)
      $ gdb --quiet perf
      Reading symbols from perf...
      (gdb) r inject -i perf.data --vm-time-correlation=dry-run
      Starting program: /home/ahunter/bin/perf inject -i perf.data --vm-time-correlation=dry-run
      [Thread debugging using libthread_db enabled]
      Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
    
      Program received signal SIGSEGV, Segmentation fault.
      __GI___fileno (fp=0x0) at fileno.c:35
      35      fileno.c: No such file or directory.
      (gdb) bt
      #0  __GI___fileno (fp=0x0) at fileno.c:35
      #1  0x00005621e48dd987 in perf_data__fd (data=0x7fff4c68bd08) at util/data.h:72
      #2  perf_data__fd (data=0x7fff4c68bd08) at util/data.h:69
      #3  cmd_inject (argc=<optimized out>, argv=0x7fff4c69c1f0) at builtin-inject.c:1017
      #4  0x00005621e4936783 in run_builtin (p=0x5621e4ee6878 <commands+600>, argc=4, argv=0x7fff4c69c1f0) at perf.c:313
      #5  0x00005621e4897d5c in handle_internal_command (argv=<optimized out>, argc=<optimized out>) at perf.c:365
      #6  run_argv (argcp=<optimized out>, argv=<optimized out>) at perf.c:409
      #7  main (argc=4, argv=0x7fff4c69c1f0) at perf.c:539
      (gdb)
    
    Fixes: 0ae03893 ("perf tools: Pass a fd to perf_file_header__read_pipe()")
    Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
    Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Riccardo Mancini <rickyman7@gmail.com>
    Cc: stable@vger.kernel.org
    Link: http://lore.kernel.org/lkml/20211213084829.114772-3-adrian.hunter@intel.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    c271a55b
builtin-inject.c 29.2 KB