perf probe: Handle strdup() failure

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Feb 28, 2015 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2015-02-28 09:32 UTC #0 lore raw

Commit-ID:  38ae502b1df196f712f6f5d3609afc36337b330b
Gitweb:     http://git.kernel.org/tip/38ae502b1df196f712f6f5d3609afc36337b330b
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 26 Feb 2015 11:47:18 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 27 Feb 2015 10:08:29 -0300

perf probe: Handle strdup() failure

We could end up returning 0 (Ok) with a NULL raw_path. Fix it.

Acked-by Masami Hiramatsu <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Naohiro Aota <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/probe-event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

tools/perf/util/probe-event.c +1 -1

index 4a93bf4..9526cf3 100644
@@ -533,7 +533,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,
 		else {
 			if (access(raw_path, R_OK) == 0) {
 				*new_path = strdup(raw_path);
-				return 0;
+				return *new_path ? 0 : -ENOMEM;
 			} else
 				return -errno;
 		}