| From cf346d5bd4b9d61656df2f72565c9b354ef3ca0d Mon Sep 17 00:00:00 2001 |
| From: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Date: Tue, 25 Oct 2016 17:20:47 -0300 |
| Subject: perf scripting: Avoid leaking the scripting_context variable |
| |
| From: Arnaldo Carvalho de Melo <acme@redhat.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/util/trace-event-scripting.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/tools/perf/util/trace-event-scripting.c |
| +++ b/tools/perf/util/trace-event-scripting.c |
| @@ -95,7 +95,8 @@ static void register_python_scripting(st |
| 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 |
| @@ -159,7 +160,8 @@ static void register_perl_scripting(stru |
| 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 |
