Em Tue, May 31, 2016 at 10:27:43PM +0900, Masami Hiramatsu escreveu:
> On Tue, 31 May 2016 13:06:15 +0000
> Wang Nan <[email protected]> wrote:
>
> > If zalloc fail, setting evlist->mmap[i].fd is unsafe.
> > perf_evlist__alloc_mmap() should fail right after zalloc() fail.
>
> Good catch!!
>
> Reviewed-by: Masami Hiramatsu <[email protected]>
Applied, after adding a:
Fixes: d4c6fb36ac2c ("perf evsel: Record fd into perf_mmap")
> Thanks!
>
> >
> > Signed-off-by: Wang Nan <[email protected]>
> > Cc: Arnaldo Carvalho de Melo <[email protected]>
> > Cc: He Kuang <[email protected]>
> > Cc: Jiri Olsa <[email protected]>
> > Cc: Masami Hiramatsu <[email protected]>
> > Cc: Namhyung Kim <[email protected]>
> > Cc: Zefan Li <[email protected]>
> > Cc: [email protected]
> > ---
> > tools/perf/util/evlist.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> > index e0f3094..1b918aa 100644
> > --- a/tools/perf/util/evlist.c
> > +++ b/tools/perf/util/evlist.c
> > @@ -946,9 +946,12 @@ static int perf_evlist__alloc_mmap(struct perf_evlist
> > *evlist)
> > if (cpu_map__empty(evlist->cpus))
> > evlist->nr_mmaps = thread_map__nr(evlist->threads);
> > evlist->mmap = zalloc(evlist->nr_mmaps * sizeof(struct perf_mmap));
> > + if (!evlist->mmap)
> > + return -ENOMEM;
> > +
> > for (i = 0; i < evlist->nr_mmaps; i++)
> > evlist->mmap[i].fd = -1;
> > - return evlist->mmap != NULL ? 0 : -ENOMEM;
> > + return 0;
> > }
> >
> > struct mmap_params {
> > --
> > 1.8.3.4
> >
>
>
> --
> Masami Hiramatsu <[email protected]>
