perf script perl: Fail check on dynamic allocation

[PATCH] perf script perl: Fail check on dynamic allocation

Posted by zhaimingbing 2 years ago

Return ENOMEM when dynamic allocation failed.

Signed-off-by: zhaimingbing <zhaimingbing@cmss.chinamobile.com>
---
 tools/perf/util/scripting-engines/trace-event-perl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 603091317..b072ac5d3 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -490,6 +490,9 @@ static int perl_start_script(const char *script, int argc, const char **argv,
 	scripting_context->session = session;
 
 	command_line = malloc((argc + 2) * sizeof(const char *));
+	if (!command_line)
+		return -ENOMEM;
+
 	command_line[0] = "";
 	command_line[1] = script;
 	for (i = 2; i < argc + 2; i++)
-- 
2.33.0

Re: [PATCH] perf script perl: Fail check on dynamic allocation

Posted by Ian Rogers 2 years ago

On Mon, Nov 20, 2023 at 3:24 AM zhaimingbing
<zhaimingbing@cmss.chinamobile.com> wrote:
>
> Return ENOMEM when dynamic allocation failed.
>
> Signed-off-by: zhaimingbing <zhaimingbing@cmss.chinamobile.com>

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

Thanks,
Ian

> ---
>  tools/perf/util/scripting-engines/trace-event-perl.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
> index 603091317..b072ac5d3 100644
> --- a/tools/perf/util/scripting-engines/trace-event-perl.c
> +++ b/tools/perf/util/scripting-engines/trace-event-perl.c
> @@ -490,6 +490,9 @@ static int perl_start_script(const char *script, int argc, const char **argv,
>         scripting_context->session = session;
>
>         command_line = malloc((argc + 2) * sizeof(const char *));
> +       if (!command_line)
> +               return -ENOMEM;
> +
>         command_line[0] = "";
>         command_line[1] = script;
>         for (i = 2; i < argc + 2; i++)
> --
> 2.33.0
>
>
>
>

Re: [PATCH] perf script perl: Fail check on dynamic allocation

Posted by Arnaldo Carvalho de Melo 2 years ago

Em Mon, Nov 20, 2023 at 04:30:28PM -0800, Ian Rogers escreveu:
> On Mon, Nov 20, 2023 at 3:24 AM zhaimingbing
> <zhaimingbing@cmss.chinamobile.com> wrote:
> >
> > Return ENOMEM when dynamic allocation failed.
> >
> > Signed-off-by: zhaimingbing <zhaimingbing@cmss.chinamobile.com>
> 
> Reviewed-by: Ian Rogers <irogers@google.com>

Thanks, applied to perf-tools-next.

- Arnaldo

 
> Thanks,
> Ian
> 
> > ---
> >  tools/perf/util/scripting-engines/trace-event-perl.c | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
> > index 603091317..b072ac5d3 100644
> > --- a/tools/perf/util/scripting-engines/trace-event-perl.c
> > +++ b/tools/perf/util/scripting-engines/trace-event-perl.c
> > @@ -490,6 +490,9 @@ static int perl_start_script(const char *script, int argc, const char **argv,
> >         scripting_context->session = session;
> >
> >         command_line = malloc((argc + 2) * sizeof(const char *));
> > +       if (!command_line)
> > +               return -ENOMEM;
> > +
> >         command_line[0] = "";
> >         command_line[1] = script;
> >         for (i = 2; i < argc + 2; i++)
> > --
> > 2.33.0
> >
> >
> >
> >

-- 

- Arnaldo