Re: [PATCH] perf jevents: Fix suspicious code in fixregex()

Ian Rogers
2020-09-03T17:47:55Z

On Thu, Sep 3, 2020 at 8:25 AM Namhyung Kim <namhyung@kernel.org> wrote:
>
> The new string should have enough space for the original string and
> the back slashes IMHO.
>
> Cc: John Garry <john.garry@huawei.com>
> Cc: Kajol Jain <kjain@linux.ibm.com>
> Cc: Ian Rogers <irogers@google.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Reviewed-by: Ian Rogers <irogers@google.com>

Definitely looks like the right fix. I'm surprised this hasn't shown
up in sanitizer testing.

Thanks,
Ian

> ---
> tools/perf/pmu-events/jevents.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index fa86c5f997cc..fc9c158bfa13 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -137,7 +137,7 @@ static char *fixregex(char *s)
> return s;
>
> /* allocate space for a new string */
> - fixed = (char *) malloc(len + 1);
> + fixed = (char *) malloc(len + esc_count + 1);
> if (!fixed)
> return NULL;
>
> --
> 2.28.0.402.g5ffc5be6b7-goog
>