* [PATCH] perf probe: Fix an error handling path in 'parse_perf_probe_command()'
@ 2020-03-15 20:12 ` Christophe JAILLET
0 siblings, 0 replies; 4+ messages in thread
From: Christophe JAILLET @ 2020-03-15 20:12 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, mhiramat, allison, rostedt, tglx
Cc: linux-kernel, kernel-janitors, Christophe JAILLET
If a memory allocation fail, we should branch to the error handling path in
order to free some resources allocated a few lines above.
Fixes: 15354d546986 ("perf probe: Generate event name with line number")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
tools/perf/util/probe-event.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index eea132f512b0..65a615ee4b4c 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1683,8 +1683,10 @@ int parse_perf_probe_command(const char *cmd, struct perf_probe_event *pev)
if (!pev->event && pev->point.function && pev->point.line
&& !pev->point.lazy_line && !pev->point.offset) {
if (asprintf(&pev->event, "%s_L%d", pev->point.function,
- pev->point.line) < 0)
- return -ENOMEM;
+ pev->point.line) < 0) {
+ ret = -ENOMEM;
+ goto out;
+ }
}
/* Copy arguments and ensure return probe has no C argument */
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] perf probe: Fix an error handling path in 'parse_perf_probe_command()'
@ 2020-03-15 20:12 ` Christophe JAILLET
0 siblings, 0 replies; 4+ messages in thread
From: Christophe JAILLET @ 2020-03-15 20:12 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, mhiramat, allison, rostedt, tglx
Cc: linux-kernel, kernel-janitors, Christophe JAILLET
If a memory allocation fail, we should branch to the error handling path in
order to free some resources allocated a few lines above.
Fixes: 15354d546986 ("perf probe: Generate event name with line number")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
tools/perf/util/probe-event.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index eea132f512b0..65a615ee4b4c 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1683,8 +1683,10 @@ int parse_perf_probe_command(const char *cmd, struct perf_probe_event *pev)
if (!pev->event && pev->point.function && pev->point.line
&& !pev->point.lazy_line && !pev->point.offset) {
if (asprintf(&pev->event, "%s_L%d", pev->point.function,
- pev->point.line) < 0)
- return -ENOMEM;
+ pev->point.line) < 0) {
+ ret = -ENOMEM;
+ goto out;
+ }
}
/* Copy arguments and ensure return probe has no C argument */
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] perf probe: Fix an error handling path in 'parse_perf_probe_command()'
2020-03-15 20:12 ` Christophe JAILLET
@ 2020-03-17 14:16 ` Masami Hiramatsu
-1 siblings, 0 replies; 4+ messages in thread
From: Masami Hiramatsu @ 2020-03-17 14:16 UTC (permalink / raw)
To: Christophe JAILLET
Cc: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, allison, rostedt, tglx, linux-kernel, kernel-janitors
On Sun, 15 Mar 2020 21:12:59 +0100
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> If a memory allocation fail, we should branch to the error handling path in
> order to free some resources allocated a few lines above.
>
Good catch!
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you,
> Fixes: 15354d546986 ("perf probe: Generate event name with line number")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> tools/perf/util/probe-event.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index eea132f512b0..65a615ee4b4c 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -1683,8 +1683,10 @@ int parse_perf_probe_command(const char *cmd, struct perf_probe_event *pev)
> if (!pev->event && pev->point.function && pev->point.line
> && !pev->point.lazy_line && !pev->point.offset) {
> if (asprintf(&pev->event, "%s_L%d", pev->point.function,
> - pev->point.line) < 0)
> - return -ENOMEM;
> + pev->point.line) < 0) {
> + ret = -ENOMEM;
> + goto out;
> + }
> }
>
> /* Copy arguments and ensure return probe has no C argument */
> --
> 2.20.1
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] perf probe: Fix an error handling path in 'parse_perf_probe_command()'
@ 2020-03-17 14:16 ` Masami Hiramatsu
0 siblings, 0 replies; 4+ messages in thread
From: Masami Hiramatsu @ 2020-03-17 14:16 UTC (permalink / raw)
To: Christophe JAILLET
Cc: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa,
namhyung, allison, rostedt, tglx, linux-kernel, kernel-janitors
On Sun, 15 Mar 2020 21:12:59 +0100
Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> If a memory allocation fail, we should branch to the error handling path in
> order to free some resources allocated a few lines above.
>
Good catch!
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Thank you,
> Fixes: 15354d546986 ("perf probe: Generate event name with line number")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> tools/perf/util/probe-event.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index eea132f512b0..65a615ee4b4c 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -1683,8 +1683,10 @@ int parse_perf_probe_command(const char *cmd, struct perf_probe_event *pev)
> if (!pev->event && pev->point.function && pev->point.line
> && !pev->point.lazy_line && !pev->point.offset) {
> if (asprintf(&pev->event, "%s_L%d", pev->point.function,
> - pev->point.line) < 0)
> - return -ENOMEM;
> + pev->point.line) < 0) {
> + ret = -ENOMEM;
> + goto out;
> + }
> }
>
> /* Copy arguments and ensure return probe has no C argument */
> --
> 2.20.1
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-17 14:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-15 20:12 [PATCH] perf probe: Fix an error handling path in 'parse_perf_probe_command()' Christophe JAILLET
2020-03-15 20:12 ` Christophe JAILLET
2020-03-17 14:16 ` Masami Hiramatsu
2020-03-17 14:16 ` Masami Hiramatsu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.