Messages in this thread | | | Date | Wed, 25 Sep 2013 12:45:48 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH V2 01/10] perf tools: fix path unpopulated in machine__create_modules() |
| |
Em Sun, Sep 22, 2013 at 01:22:09PM +0300, Adrian Hunter escreveu: > In machine__create_modules() the 'path' char array > was used in a call to symbol__restricted_filename() > without always being populated. > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> > --- > tools/perf/util/machine.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index 933d14f..ddf917b 100644 > --- a/tools/perf/util/machine.c > +++ b/tools/perf/util/machine.c > @@ -785,14 +785,14 @@ static int machine__create_modules(struct machine *machine) > const char *modules; > char path[PATH_MAX]; > > - if (machine__is_default_guest(machine)) > + if (machine__is_default_guest(machine)) { > modules = symbol_conf.default_guest_modules; > - else { > - sprintf(path, "%s/proc/modules", machine->root_dir); > + } else { > + snprintf(path, PATH_MAX, "%s/proc/modules", machine->root_dir); > modules = path; > }
While I don't dispute the above is an improvement, I think it is unrelated to the fix described in the changeset comment, so I'm breaking this patch into two and adding the strict fix to perf/urgent, the other part (s/sprintf/snprintf/g) to perf/core, with respective explanation,
Thanks,
- Arnaldo
> > - if (symbol__restricted_filename(path, "/proc/modules")) > + if (symbol__restricted_filename(modules, "/proc/modules")) > return -1; > > file = fopen(modules, "r"); > -- > 1.7.11.7
| |