* [PATCH] perf expr: Fix memory leaks in metric bison
@ 2020-05-13 0:03 Ian Rogers
2020-05-13 17:52 ` Jiri Olsa
0 siblings, 1 reply; 3+ messages in thread
From: Ian Rogers @ 2020-05-13 0:03 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Andi Kleen, linux-kernel
Cc: Stephane Eranian, Ian Rogers
Add a destructor for strings to reclaim memory in the event of errors.
Free the ID given for a lookup, it was previously strdup-ed in the lex
code.
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/expr.y | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index 21e82a1e11a2..3b49b230b111 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -27,6 +27,7 @@
%token EXPR_PARSE EXPR_OTHER EXPR_ERROR
%token <num> NUMBER
%token <str> ID
+%destructor { free ($$); } <str>
%token MIN MAX IF ELSE SMT_ON
%left MIN MAX IF
%left '|'
@@ -94,8 +95,10 @@ if_expr:
expr: NUMBER
| ID { if (lookup_id(ctx, $1, &$$) < 0) {
pr_debug("%s not found\n", $1);
+ free($1);
YYABORT;
}
+ free($1);
}
| expr '|' expr { $$ = (long)$1 | (long)$3; }
| expr '&' expr { $$ = (long)$1 & (long)$3; }
--
2.26.2.645.ge9eca65c58-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf expr: Fix memory leaks in metric bison
2020-05-13 0:03 [PATCH] perf expr: Fix memory leaks in metric bison Ian Rogers
@ 2020-05-13 17:52 ` Jiri Olsa
2020-05-13 17:58 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Olsa @ 2020-05-13 17:52 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Andi Kleen,
linux-kernel, Stephane Eranian
On Tue, May 12, 2020 at 05:03:18PM -0700, Ian Rogers wrote:
> Add a destructor for strings to reclaim memory in the event of errors.
> Free the ID given for a lookup, it was previously strdup-ed in the lex
> code.
>
> Reviewed-by: Andi Kleen <ak@linux.intel.com>
> Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
> ---
> tools/perf/util/expr.y | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
> index 21e82a1e11a2..3b49b230b111 100644
> --- a/tools/perf/util/expr.y
> +++ b/tools/perf/util/expr.y
> @@ -27,6 +27,7 @@
> %token EXPR_PARSE EXPR_OTHER EXPR_ERROR
> %token <num> NUMBER
> %token <str> ID
> +%destructor { free ($$); } <str>
> %token MIN MAX IF ELSE SMT_ON
> %left MIN MAX IF
> %left '|'
> @@ -94,8 +95,10 @@ if_expr:
> expr: NUMBER
> | ID { if (lookup_id(ctx, $1, &$$) < 0) {
> pr_debug("%s not found\n", $1);
> + free($1);
> YYABORT;
> }
> + free($1);
> }
> | expr '|' expr { $$ = (long)$1 | (long)$3; }
> | expr '&' expr { $$ = (long)$1 & (long)$3; }
> --
> 2.26.2.645.ge9eca65c58-goog
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] perf expr: Fix memory leaks in metric bison
2020-05-13 17:52 ` Jiri Olsa
@ 2020-05-13 17:58 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-05-13 17:58 UTC (permalink / raw)
To: Jiri Olsa
Cc: Ian Rogers, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Namhyung Kim, Andi Kleen, linux-kernel,
Stephane Eranian
Em Wed, May 13, 2020 at 07:52:53PM +0200, Jiri Olsa escreveu:
> On Tue, May 12, 2020 at 05:03:18PM -0700, Ian Rogers wrote:
> > Add a destructor for strings to reclaim memory in the event of errors.
> > Free the ID given for a lookup, it was previously strdup-ed in the lex
> > code.
> >
> > Reviewed-by: Andi Kleen <ak@linux.intel.com>
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
Thanks, applied.
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-13 17:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-13 0:03 [PATCH] perf expr: Fix memory leaks in metric bison Ian Rogers
2020-05-13 17:52 ` Jiri Olsa
2020-05-13 17:58 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).