lkml.org 
[lkml]   [2017]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 175/235] perf scripting: Avoid leaking the scripting_context variable
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit cf346d5bd4b9d61656df2f72565c9b354ef3ca0d upstream.

    Both register_perl_scripting() and register_python_scripting() allocate
    this variable, fix it by checking if it already was.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Tom Zanussi <tzanussi@gmail.com>
    Cc: Wang Nan <wangnan0@huawei.com>
    Fixes: 7e4b21b84c43 ("perf/scripts: Add Python scripting engine")
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    tools/perf/util/trace-event-scripting.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c
    index 95199e4eea97..f928bfc4852f 100644
    --- a/tools/perf/util/trace-event-scripting.c
    +++ b/tools/perf/util/trace-event-scripting.c
    @@ -91,7 +91,8 @@ static void register_python_scripting(struct scripting_ops *scripting_ops)
    if (err)
    die("error registering py script extension");

    - scripting_context = malloc(sizeof(struct scripting_context));
    + if (scripting_context == NULL)
    + scripting_context = malloc(sizeof(*scripting_context));
    }

    #ifdef NO_LIBPYTHON
    @@ -154,7 +155,8 @@ static void register_perl_scripting(struct scripting_ops *scripting_ops)
    if (err)
    die("error registering pl script extension");

    - scripting_context = malloc(sizeof(struct scripting_context));
    + if (scripting_context == NULL)
    + scripting_context = malloc(sizeof(*scripting_context));
    }

    #ifdef NO_LIBPERL
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-01-27 12:14    [W:4.166 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site