2022-03-11 20:56:09

by Weiguo Li

Subject: [PATCH] perf parse-events: Fix null check

We did a null check after "tmp->symbol = strdup(...)", but we checked
"list->symbol" other than "tmp->symbol".

Signed-off-by: Weiguo Li <[email protected]>
---
tools/perf/util/parse-events.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 9739b05b999e..dfb50a5f83d0 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2193,7 +2193,7 @@ int perf_pmu__test_parse_init(void)
for (i = 0; i < ARRAY_SIZE(symbols); i++, tmp++) {
tmp->type = symbols[i].type;
tmp->symbol = strdup(symbols[i].symbol);
- if (!list->symbol)
+ if (!tmp->symbol)
goto err_free;
}

--
2.25.1

2022-03-11 23:30:43

by John Garry

Subject: Re: [PATCH] perf parse-events: Fix null check

On 11/03/2022 13:06, Weiguo Li wrote:
> We did a null check after "tmp->symbol = strdup(...)", but we checked
> "list->symbol" other than "tmp->symbol".
>
> Signed-off-by: Weiguo Li <[email protected]>

Reviewed-by: John Garry <[email protected]>

> ---
> tools/perf/util/parse-events.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 9739b05b999e..dfb50a5f83d0 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -2193,7 +2193,7 @@ int perf_pmu__test_parse_init(void)
> for (i = 0; i < ARRAY_SIZE(symbols); i++, tmp++) {
> tmp->type = symbols[i].type;
> tmp->symbol = strdup(symbols[i].symbol);
> - if (!list->symbol)
> + if (!tmp->symbol)
> goto err_free;
> }
>

2022-03-14 02:32:52

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf parse-events: Fix null check

Em Fri, Mar 11, 2022 at 02:00:13PM +0000, John Garry escreveu:
> On 11/03/2022 13:06, Weiguo Li wrote:
> > We did a null check after "tmp->symbol = strdup(...)", but we checked
> > "list->symbol" other than "tmp->symbol".
> >
> > Signed-off-by: Weiguo Li <[email protected]>
>
> Reviewed-by: John Garry <[email protected]>

Thanks, applied.

- Arnaldo


> > ---
> > tools/perf/util/parse-events.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> > index 9739b05b999e..dfb50a5f83d0 100644
> > --- a/tools/perf/util/parse-events.c
> > +++ b/tools/perf/util/parse-events.c
> > @@ -2193,7 +2193,7 @@ int perf_pmu__test_parse_init(void)
> > for (i = 0; i < ARRAY_SIZE(symbols); i++, tmp++) {
> > tmp->type = symbols[i].type;
> > tmp->symbol = strdup(symbols[i].symbol);
> > - if (!list->symbol)
> > + if (!tmp->symbol)
> > goto err_free;
> > }

--

- Arnaldo