lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 110/272] perf mmap: Fix accessing unmapped mmap in perf_mmap__read_done()
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kan Liang <kan.liang@linux.intel.com>

    [ Upstream commit f58385f629c87a9e210108b39c1f4950d0363ad2 ]

    There is a segmentation fault when running 'perf trace'. For example:

    [root@jouet e]# perf trace -e *chdir -o /tmp/bla perf report --ignore-vmlinux -i ../perf.data

    The perf_mmap__consume() could unmap the mmap. It needs to check the
    refcnt in perf_mmap__read_done().

    Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Fixes: ee023de05f35 ("perf mmap: Introduce perf_mmap__read_done()")
    Link: http://lkml.kernel.org/r/1522071729-16776-1-git-send-email-kan.liang@linux.intel.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/util/mmap.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/tools/perf/util/mmap.c
    +++ b/tools/perf/util/mmap.c
    @@ -344,5 +344,11 @@ out:
    */
    void perf_mmap__read_done(struct perf_mmap *map)
    {
    + /*
    + * Check if event was unmapped due to a POLLHUP/POLLERR.
    + */
    + if (!refcount_read(&map->refcnt))
    + return;
    +
    map->prev = perf_mmap__read_head(map);
    }

    \
     
     \ /
      Last update: 2018-05-28 13:54    [W:4.279 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site