Commit bd862b1d authored by He Zhe's avatar He Zhe Committed by Arnaldo Carvalho de Melo

perf probe: Check return value of strlist__add() for -ENOMEM

strlist__add() may fail with -ENOMEM. Check it and give debugging hint
in advance.
Signed-off-by: default avatarHe Zhe <zhe.he@windriver.com>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lore.kernel.org/lkml/1582727404-180095-1-git-send-email-zhe.he@windriver.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b0aaf4c8
...@@ -449,7 +449,8 @@ static int perf_del_probe_events(struct strfilter *filter) ...@@ -449,7 +449,8 @@ static int perf_del_probe_events(struct strfilter *filter)
ret = probe_file__del_strlist(kfd, klist); ret = probe_file__del_strlist(kfd, klist);
if (ret < 0) if (ret < 0)
goto error; goto error;
} } else if (ret == -ENOMEM)
goto error;
ret2 = probe_file__get_events(ufd, filter, ulist); ret2 = probe_file__get_events(ufd, filter, ulist);
if (ret2 == 0) { if (ret2 == 0) {
...@@ -459,7 +460,8 @@ static int perf_del_probe_events(struct strfilter *filter) ...@@ -459,7 +460,8 @@ static int perf_del_probe_events(struct strfilter *filter)
ret2 = probe_file__del_strlist(ufd, ulist); ret2 = probe_file__del_strlist(ufd, ulist);
if (ret2 < 0) if (ret2 < 0)
goto error; goto error;
} } else if (ret2 == -ENOMEM)
goto error;
if (ret == -ENOENT && ret2 == -ENOENT) if (ret == -ENOENT && ret2 == -ENOENT)
pr_warning("\"%s\" does not hit any event.\n", str); pr_warning("\"%s\" does not hit any event.\n", str);
......
...@@ -301,10 +301,15 @@ int probe_file__get_events(int fd, struct strfilter *filter, ...@@ -301,10 +301,15 @@ int probe_file__get_events(int fd, struct strfilter *filter,
p = strchr(ent->s, ':'); p = strchr(ent->s, ':');
if ((p && strfilter__compare(filter, p + 1)) || if ((p && strfilter__compare(filter, p + 1)) ||
strfilter__compare(filter, ent->s)) { strfilter__compare(filter, ent->s)) {
strlist__add(plist, ent->s); ret = strlist__add(plist, ent->s);
if (ret == -ENOMEM) {
pr_err("strlist__add failed with -ENOMEM\n");
goto out;
}
ret = 0; ret = 0;
} }
} }
out:
strlist__delete(namelist); strlist__delete(namelist);
return ret; return ret;
...@@ -511,7 +516,11 @@ static int probe_cache__load(struct probe_cache *pcache) ...@@ -511,7 +516,11 @@ static int probe_cache__load(struct probe_cache *pcache)
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
strlist__add(entry->tevlist, buf); ret = strlist__add(entry->tevlist, buf);
if (ret == -ENOMEM) {
pr_err("strlist__add failed with -ENOMEM\n");
goto out;
}
} }
} }
out: out:
...@@ -672,7 +681,12 @@ int probe_cache__add_entry(struct probe_cache *pcache, ...@@ -672,7 +681,12 @@ int probe_cache__add_entry(struct probe_cache *pcache,
command = synthesize_probe_trace_command(&tevs[i]); command = synthesize_probe_trace_command(&tevs[i]);
if (!command) if (!command)
goto out_err; goto out_err;
strlist__add(entry->tevlist, command); ret = strlist__add(entry->tevlist, command);
if (ret == -ENOMEM) {
pr_err("strlist__add failed with -ENOMEM\n");
goto out_err;
}
free(command); free(command);
} }
list_add_tail(&entry->node, &pcache->entries); list_add_tail(&entry->node, &pcache->entries);
...@@ -853,9 +867,15 @@ int probe_cache__scan_sdt(struct probe_cache *pcache, const char *pathname) ...@@ -853,9 +867,15 @@ int probe_cache__scan_sdt(struct probe_cache *pcache, const char *pathname)
break; break;
} }
strlist__add(entry->tevlist, buf); ret = strlist__add(entry->tevlist, buf);
free(buf); free(buf);
entry = NULL; entry = NULL;
if (ret == -ENOMEM) {
pr_err("strlist__add failed with -ENOMEM\n");
break;
}
} }
if (entry) { if (entry) {
list_del_init(&entry->node); list_del_init(&entry->node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment