perf tools: fix potential memory leak
Ian Rogers
reviewerPATCH 1/1 perf tools: fix potential memory leak
An error may be in place when tracepoint_error is called, use parse_events__handle_error to avoid a memory leak and to capture the first and last error. Error detected by LLVM's libFuzzer using the following event:
$ perf stat -e 'msr/event/,f:e'
event syntax error: 'msr/event/,f:e'
\___ can't access trace eventsError: No permissions to read /sys/kernel/debug/tracing/events/f/e Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/'
Initial error:
event syntax error: 'msr/event/,f:e'
\___ no value assigned for term
Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/util/parse-events.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/util/parse-events.c +5 -4
@@ -511,6 +511,7 @@ int parse_events_add_cache(struct list_head *list, int *idx,static void tracepoint_error (struct parse_events_error *e,int err,const char *sys,const char *name) { +const char *str;char help[BUFSIZ ];if (!e)
@@ -524,18 +525,18 @@ static void tracepoint_error(struct parse_events_error *e, int err,switch (err) {case EACCES : - e->str =strdup ("can't access trace events" ); + str ="can't access trace events" ;break ;case ENOENT : - e->str =strdup ("unknown tracepoint" ); + str ="unknown tracepoint" ;break ;default : - e->str =strdup ("failed to add tracepoint" ); + str ="failed to add tracepoint" ;break ; }tracing_path__strerror_open_tp (err, help,sizeof (help), sys, name); - e->help =strdup (help); +parse_events__handle_error (e,0 ,strdup (str),strdup (help)); } static int add_tracepoint(struct list_head *list, int *idx,
Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Arnaldo Carvalho de Melo
AppliedEm Wed, Nov 20, 2019 at 10:09:25AM -0800, Ian Rogers escreveu:
Quoted 12 lines
An error may be in place when
tracepoint_erroris called, useparse_events__handle_errorto avoid a memory leak and to capture the first and last error. Error detected by LLVM's libFuzzer using the following event:$ perf stat -e 'msr/event/,f:e' event syntax error: 'msr/event/,f:e' \___ can't access trace eventsError: No permissions to read /sys/kernel/debug/tracing/events/f/e Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/'
Quoted 8 lines
Initial error:
event syntax error: 'msr/event/,f:e'
\___ no value assigned for term
Run 'perf list' for a list of valid eventsUsage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
Thanks, applied.
- Arnaldo
Quoted 42 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/parse-events.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)tools/perf/util/parse-events.c +5
-4@@ -511,6 +511,7 @@ int parse_events_add_cache(struct list_head *list, int *idx,static void tracepoint_error (struct parse_events_error *e,int err,const char *sys,const char *name) { +const char *str;char help[BUFSIZ ];if (!e)@@ -524,18 +525,18 @@ static void tracepoint_error(struct parse_events_error *e, int err,switch (err) {case EACCES : - e->str =strdup ("can't access trace events" ); + str ="can't access trace events" ;break ;case ENOENT : - e->str =strdup ("unknown tracepoint" ); + str ="unknown tracepoint" ;break ;default : - e->str =strdup ("failed to add tracepoint" ); + str ="failed to add tracepoint" ;break ; }tracing_path__strerror_open_tp (err, help,sizeof (help), sys, name); - e->help =strdup (help); +parse_events__handle_error (e,0 ,strdup (str),strdup (help)); } static int add_tracepoint(struct list_head *list, int *idx,Signature · 1 line
2.24.0.432.g9d3f5f5b63-goog
Signature · 1 line
- Arnaldo
[tip: perf/core] perf parse: Fix potential memory leak when handling tracepoint errors
In reply to Ian RogersThe following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 4584f084aa9d8033d5911935837dbee7b082d0e9 Gitweb: https://git.kernel.org/tip/4584f084aa9d8033d5911935837dbee7b082d0e9 Author: Ian Rogers <[email protected]> AuthorDate: Wed, 20 Nov 2019 10:09:25 -08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 22 Nov 2019 10:48:14 -03:00
perf parse: Fix potential memory leak when handling tracepoint errors
An error may be in place when tracepoint_error is called, use parse_events__handle_error to avoid a memory leak and to capture the first and last error. Error detected by LLVM's libFuzzer using the following event:
$ perf stat -e 'msr/event/,f:e'
event syntax error: 'msr/event/,f:e'
\___ can't access trace eventsError: No permissions to read /sys/kernel/debug/tracing/events/f/e Hint: Try 'sudo mount -o remount,mode=755 /sys/kernel/debug/tracing/'
Initial error:
event syntax error: 'msr/event/,f:e'
\___ no value assigned for term
Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/util/parse-events.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/perf/util/parse-events.c +5 -4
@@ -511,6 +511,7 @@ int parse_events_add_cache(struct list_head *list, int *idx,static void tracepoint_error (struct parse_events_error *e,int err,const char *sys,const char *name) { +const char *str;char help[BUFSIZ ];if (!e)
@@ -524,18 +525,18 @@ static void tracepoint_error(struct parse_events_error *e, int err,switch (err) {case EACCES : - e->str =strdup ("can't access trace events" ); + str ="can't access trace events" ;break ;case ENOENT : - e->str =strdup ("unknown tracepoint" ); + str ="unknown tracepoint" ;break ;default : - e->str =strdup ("failed to add tracepoint" ); + str ="failed to add tracepoint" ;break ; }tracing_path__strerror_open_tp (err, help,sizeof (help), sys, name); - e->help =strdup (help); +parse_events__handle_error (e,0 ,strdup (str),strdup (help)); } static int add_tracepoint(struct list_head *list, int *idx,