redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

perf annotate: Use asprintf when formatting objdump command line 

commit 6810158d52 upstream.

We were using a local buffer with an arbitrary size, that would have to
get increased to avoid truncation as warned by gcc 8:

  util/annotate.c: In function 'symbol__disassemble':
  util/annotate.c:1488:4: error: '%s' directive output may be truncated writing up to 4095 bytes into a region of size between 3966 and 8086 [-Werror=format-truncation=]
      "%s %s%s --start-address=0x%016" PRIx64
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  util/annotate.c:1498:20:
      symfs_filename, symfs_filename);
                      ~~~~~~~~~~~~~~
  util/annotate.c:1490:50: note: format string is defined here
      " -l -d %s %s -C \"%s\" 2>/dev/null|grep -v \"%s:\"|expand",
                                                  ^~
  In file included from /usr/include/stdio.h:861,
                   from util/color.h:5,
                   from util/sort.h:8,
                   from util/annotate.c:14:
  /usr/include/bits/stdio2.h:67:10: note: '__builtin___snprintf_chk' output 116 or more bytes (assuming 8331) into a destination of size 8192
     return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          __bos (__s), __fmt, __va_arg_pack ());
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

So switch to asprintf, that will make sure enough space is available.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-qagoy2dmbjpc9gdnaj0r3mml@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Ignat Korchagin <ignat@cloudflare.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
pull/10/head
Arnaldo Carvalho de Melo 2018-03-14 10:34:11 -03:00 committed by Greg Kroah-Hartman
parent 79f87e09bc
commit ec727693a9
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/perf/util/annotate.c
View File

@ -1432,7 +1432,7 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
struct arch **parch, char *cpuid)
{
struct dso *dso = map->dso;
char command[PATH_MAX * 2];
char *command;
struct arch *arch = NULL;
FILE *file;
char symfs_filename[PATH_MAX];
@ -1496,7 +1496,7 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
strcpy(symfs_filename, tmp);
}
snprintf(command, sizeof(command),
err = asprintf(&command,
"%s %s%s --start-address=0x%016" PRIx64
" --stop-address=0x%016" PRIx64
" -l -d %s %s -C \"%s\" 2>/dev/null|grep -v \"%s:\"|expand",
@ -1509,12 +1509,17 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
symbol_conf.annotate_src ? "-S" : "",
symfs_filename, symfs_filename);
if (err < 0) {
pr_err("Failure allocating memory for the command to run\n");
goto out_remove_tmp;
}
pr_debug("Executing: %s\n", command);
err = -1;
if (pipe(stdout_fd) < 0) {
pr_err("Failure creating the pipe to run %s\n", command);
goto out_remove_tmp;
goto out_free_command;
}
pid = fork();
@ -1541,7 +1546,7 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
* If we were using debug info should retry with
* original binary.
*/
goto out_remove_tmp;
goto out_free_command;
}
nline = 0;
@ -1570,6 +1575,8 @@ int symbol__disassemble(struct symbol *sym, struct map *map,
fclose(file);
err = 0;
out_free_command:
free(command);
out_remove_tmp:
close(stdout_fd[0]);
@ -1583,7 +1590,7 @@ out:
out_close_stdout:
close(stdout_fd[1]);
goto out_remove_tmp;
goto out_free_command;
}
static void insert_source_line(struct rb_root *root, struct source_line *src_line)