diff options
| author | Arnaldo Carvalho de Melo <[email protected]> | 2016-10-25 20:20:47 +0000 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <[email protected]> | 2016-10-28 13:29:44 +0000 |
| commit | cf346d5bd4b9d61656df2f72565c9b354ef3ca0d (patch) | |
| tree | b7e8e935a1054058985dbf2c3bb2d75ca07504d4 /tools/perf/util/trace-event-scripting.c | |
| parent | perf tools: Update x86's syscall_64.tbl, adding pkey_(alloc,free,mprotect) (diff) | |
| download | kernel-cf346d5bd4b9d61656df2f72565c9b354ef3ca0d.tar.gz kernel-cf346d5bd4b9d61656df2f72565c9b354ef3ca0d.zip | |
perf scripting: Avoid leaking the scripting_context variable
Both register_perl_scripting() and register_python_scripting() allocate
this variable, fix it by checking if it already was.
Cc: Adrian Hunter <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Tom Zanussi <[email protected]>
Cc: Wang Nan <[email protected]>
Fixes: 7e4b21b84c43 ("perf/scripts: Add Python scripting engine")
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/util/trace-event-scripting.c')
| -rw-r--r-- | tools/perf/util/trace-event-scripting.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c index 9df61059a85d..a2fd6e79d5a5 100644 --- 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(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 @@ -159,7 +160,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 |