Commit 4bf6dcaa authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Fix an error handling path in 'parse_perf_probe_command()' 



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: 15354d54 ("perf probe: Generate event name with line number")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: kernel-janitors@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/b71bcb01fa0c7b9778647235c3ab490f699ba278.1659797452.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 46f7bd5e

tools/perf/util/probe-event.c

+4 −2
Original line number Diff line number Diff line
@@ -1775,8 +1775,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 */