Commit 347ed990 authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo

perf kvm: Use strtol for walking guestmount directory

Only want to process directories under the guestmnount directory that
have a pid as a name (ie, all digits). Other entries in the guestmount
directory should be ignored.  There is already a check that requires the
first character of each entry to be a digit, but atoi is used to convert
the directory name to a pid. For example if guestmount contains a
directory with the name 1foo, atoi converts it to a pid of 1 and a
machine is created with a pid of 1. This is wrong; this directory really
should be ignored. Use strtol to do that.
Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1343616875-6455-1-git-send-email-dsahern@gmail.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 56e6f602
...@@ -2875,6 +2875,7 @@ int machines__create_guest_kernel_maps(struct rb_root *machines) ...@@ -2875,6 +2875,7 @@ int machines__create_guest_kernel_maps(struct rb_root *machines)
int i, items = 0; int i, items = 0;
char path[PATH_MAX]; char path[PATH_MAX];
pid_t pid; pid_t pid;
char *endp;
if (symbol_conf.default_guest_vmlinux_name || if (symbol_conf.default_guest_vmlinux_name ||
symbol_conf.default_guest_modules || symbol_conf.default_guest_modules ||
...@@ -2891,7 +2892,14 @@ int machines__create_guest_kernel_maps(struct rb_root *machines) ...@@ -2891,7 +2892,14 @@ int machines__create_guest_kernel_maps(struct rb_root *machines)
/* Filter out . and .. */ /* Filter out . and .. */
continue; continue;
} }
pid = atoi(namelist[i]->d_name); pid = (pid_t)strtol(namelist[i]->d_name, &endp, 10);
if ((*endp != '\0') ||
(endp == namelist[i]->d_name) ||
(errno == ERANGE)) {
pr_debug("invalid directory (%s). Skipping.\n",
namelist[i]->d_name);
continue;
}
sprintf(path, "%s/%s/proc/kallsyms", sprintf(path, "%s/%s/proc/kallsyms",
symbol_conf.guestmount, symbol_conf.guestmount,
namelist[i]->d_name); namelist[i]->d_name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment