From: Jiri Olsa <jolsa@redhat.com>
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Andi Kleen <ak@linux.intel.com>,
linux-kernel@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: Re: [PATCH] perf expr: Fix memory leaks in metric bison
Date: Wed, 13 May 2020 19:52:53 +0200 [thread overview]
Message-ID: <20200513175253.GB3343750@krava> (raw)
In-Reply-To: <20200513000318.15166-1-irogers@google.com>
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
>
next prev parent reply other threads:[~2020-05-13 17:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 0:03 [PATCH] perf expr: Fix memory leaks in metric bison Ian Rogers
2020-05-13 17:52 ` Jiri Olsa [this message]
2020-05-13 17:58 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200513175253.GB3343750@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox