Skip to content

L
linux
Commit bf4d5f25 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files
Options

perf probe: Check the return value of strbuf APIs 

Check the return value of strbuf APIs in perf-probe
related code, so that it can handle errors in strbuf.
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160510054707.6158.69861.stgit@devboxSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5cea57f3
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 97 deletions
tools/perf/util/dwarf-aux.c
View file @ bf4d5f25
...@@ -915,8 +915,7 @@ int die_get_typename(Dwarf_Die *vr_die, struct strbuf *buf) ...@@ -915,8 +915,7 @@ int die_get_typename(Dwarf_Die *vr_die, struct strbuf *buf)
tmp = "*"; tmp = "*";
else if (tag == DW_TAG_subroutine_type) { else if (tag == DW_TAG_subroutine_type) {
/* Function pointer */ /* Function pointer */
strbuf_add(buf, "(function_type)", 15); return strbuf_add(buf, "(function_type)", 15);
return 0;
} else { } else {
if (!dwarf_diename(&type)) if (!dwarf_diename(&type))
return -ENOENT; return -ENOENT;
...@@ -927,14 +926,10 @@ int die_get_typename(Dwarf_Die *vr_die, struct strbuf *buf) ...@@ -927,14 +926,10 @@ int die_get_typename(Dwarf_Die *vr_die, struct strbuf *buf)
else if (tag == DW_TAG_enumeration_type) else if (tag == DW_TAG_enumeration_type)
tmp = "enum "; tmp = "enum ";
/* Write a base name */ /* Write a base name */
strbuf_addf(buf, "%s%s", tmp, dwarf_diename(&type)); return strbuf_addf(buf, "%s%s", tmp, dwarf_diename(&type));
return 0;
} }
ret = die_get_typename(&type, buf); ret = die_get_typename(&type, buf);
if (ret == 0) return ret ? ret : strbuf_addstr(buf, tmp);
strbuf_addstr(buf, tmp);
return ret;
} }
/** /**
...@@ -951,12 +946,10 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf) ...@@ -951,12 +946,10 @@ int die_get_varname(Dwarf_Die *vr_die, struct strbuf *buf)
ret = die_get_typename(vr_die, buf); ret = die_get_typename(vr_die, buf);
if (ret < 0) { if (ret < 0) {
pr_debug("Failed to get type, make it unknown.\n"); pr_debug("Failed to get type, make it unknown.\n");
strbuf_add(buf, " (unknown_type)", 14); ret = strbuf_add(buf, " (unknown_type)", 14);
} }
strbuf_addf(buf, "\t%s", dwarf_diename(vr_die)); return ret < 0 ? ret : strbuf_addf(buf, "\t%s", dwarf_diename(vr_die));
return 0;
} }
#ifdef HAVE_DWARF_GETLOCATIONS #ifdef HAVE_DWARF_GETLOCATIONS
...@@ -999,22 +992,24 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die, ...@@ -999,22 +992,24 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,
} }
while ((offset = dwarf_ranges(&scopes[1], offset, &base, while ((offset = dwarf_ranges(&scopes[1], offset, &base,
&start, &end)) > 0) { &start, &end)) > 0) {
start -= entry; start -= entry;
end -= entry; end -= entry;
if (first) { if (first) {
strbuf_addf(buf, "@<%s+[%" PRIu64 "-%" PRIu64, ret = strbuf_addf(buf, "@<%s+[%" PRIu64 "-%" PRIu64,
name, start, end); name, start, end);
first = false; first = false;
} else { } else {
strbuf_addf(buf, ",%" PRIu64 "-%" PRIu64, ret = strbuf_addf(buf, ",%" PRIu64 "-%" PRIu64,
start, end); start, end);
} }
if (ret < 0)
goto out;
} }
if (!first) if (!first)
strbuf_add(buf, "]>", 2); ret = strbuf_add(buf, "]>", 2);
out: out:
free(scopes); free(scopes);
...@@ -1054,31 +1049,32 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf) ...@@ -1054,31 +1049,32 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)
if (dwarf_attr(vr_die, DW_AT_location, &attr) == NULL) if (dwarf_attr(vr_die, DW_AT_location, &attr) == NULL)
return -EINVAL; return -EINVAL;
while ((offset = dwarf_getlocations( while ((offset = dwarf_getlocations(&attr, offset, &base,
&attr, offset, &base, &start, &end, &op, &nops)) > 0) {
&start, &end, &op, &nops)) > 0) {
if (start == 0) { if (start == 0) {
/* Single Location Descriptions */ /* Single Location Descriptions */
ret = die_get_var_innermost_scope(sp_die, vr_die, buf); ret = die_get_var_innermost_scope(sp_die, vr_die, buf);
return ret; goto out;
} }
/* Location Lists */ /* Location Lists */
start -= entry; start -= entry;
end -= entry; end -= entry;
if (first) { if (first) {
strbuf_addf(buf, "@<%s+[%" PRIu64 "-%" PRIu64, ret = strbuf_addf(buf, "@<%s+[%" PRIu64 "-%" PRIu64,
name, start, end); name, start, end);
first = false; first = false;
} else { } else {
strbuf_addf(buf, ",%" PRIu64 "-%" PRIu64, ret = strbuf_addf(buf, ",%" PRIu64 "-%" PRIu64,
start, end); start, end);
} }
if (ret < 0)
goto out;
} }
if (!first) if (!first)
strbuf_add(buf, "]>", 2); ret = strbuf_add(buf, "]>", 2);
out:
return ret; return ret;
} }
#else #else
......
tools/perf/util/probe-event.c
View file @ bf4d5f25
...@@ -1677,28 +1677,37 @@ char *synthesize_perf_probe_arg(struct perf_probe_arg *pa) ...@@ -1677,28 +1677,37 @@ char *synthesize_perf_probe_arg(struct perf_probe_arg *pa)
{ {
struct perf_probe_arg_field *field = pa->field; struct perf_probe_arg_field *field = pa->field;
struct strbuf buf; struct strbuf buf;
char *ret; char *ret = NULL;
int err;
if (strbuf_init(&buf, 64) < 0)
return NULL;
strbuf_init(&buf, 64);
if (pa->name && pa->var) if (pa->name && pa->var)
strbuf_addf(&buf, "%s=%s", pa->name, pa->var); err = strbuf_addf(&buf, "%s=%s", pa->name, pa->var);
else else
strbuf_addstr(&buf, pa->name ?: pa->var); err = strbuf_addstr(&buf, pa->name ?: pa->var);
if (err)
goto out;
while (field) { while (field) {
if (field->name[0] == '[') if (field->name[0] == '[')
strbuf_addstr(&buf, field->name); err = strbuf_addstr(&buf, field->name);
else else
strbuf_addf(&buf, "%s%s", field->ref ? "->" : ".", err = strbuf_addf(&buf, "%s%s", field->ref ? "->" : ".",
field->name); field->name);
field = field->next; field = field->next;
if (err)
goto out;
} }
if (pa->type) if (pa->type)
strbuf_addf(&buf, ":%s", pa->type); if (strbuf_addf(&buf, ":%s", pa->type) < 0)
goto out;
ret = strbuf_detach(&buf, NULL); ret = strbuf_detach(&buf, NULL);
out:
strbuf_release(&buf);
return ret; return ret;
} }
...@@ -1706,18 +1715,23 @@ char *synthesize_perf_probe_arg(struct perf_probe_arg *pa) ...@@ -1706,18 +1715,23 @@ char *synthesize_perf_probe_arg(struct perf_probe_arg *pa)
static char *synthesize_perf_probe_point(struct perf_probe_point *pp) static char *synthesize_perf_probe_point(struct perf_probe_point *pp)
{ {
struct strbuf buf; struct strbuf buf;
char *tmp; char *tmp, *ret = NULL;
int len; int len, err = 0;
if (strbuf_init(&buf, 64) < 0)
return NULL;
strbuf_init(&buf, 64);
if (pp->function) { if (pp->function) {
strbuf_addstr(&buf, pp->function); if (strbuf_addstr(&buf, pp->function) < 0)
goto out;
if (pp->offset) if (pp->offset)
strbuf_addf(&buf, "+%lu", pp->offset); err = strbuf_addf(&buf, "+%lu", pp->offset);
else if (pp->line) else if (pp->line)
strbuf_addf(&buf, ":%d", pp->line); err = strbuf_addf(&buf, ":%d", pp->line);
else if (pp->retprobe) else if (pp->retprobe)
strbuf_addstr(&buf, "%return"); err = strbuf_addstr(&buf, "%return");
if (err)
goto out;
} }
if (pp->file) { if (pp->file) {
tmp = pp->file; tmp = pp->file;
...@@ -1726,12 +1740,15 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp) ...@@ -1726,12 +1740,15 @@ static char *synthesize_perf_probe_point(struct perf_probe_point *pp)
tmp = strchr(pp->file + len - 30, '/'); tmp = strchr(pp->file + len - 30, '/');
tmp = tmp ? tmp + 1 : pp->file + len - 30; tmp = tmp ? tmp + 1 : pp->file + len - 30;
} }
strbuf_addf(&buf, "@%s", tmp); err = strbuf_addf(&buf, "@%s", tmp);
if (!pp->function && pp->line) if (!err && !pp->function && pp->line)
strbuf_addf(&buf, ":%d", pp->line); err = strbuf_addf(&buf, ":%d", pp->line);
} }
if (!err)
return strbuf_detach(&buf, NULL); ret = strbuf_detach(&buf, NULL);
out:
strbuf_release(&buf);
return ret;
} }
#if 0 #if 0
...@@ -1762,28 +1779,30 @@ char *synthesize_perf_probe_command(struct perf_probe_event *pev) ...@@ -1762,28 +1779,30 @@ char *synthesize_perf_probe_command(struct perf_probe_event *pev)
static int __synthesize_probe_trace_arg_ref(struct probe_trace_arg_ref *ref, static int __synthesize_probe_trace_arg_ref(struct probe_trace_arg_ref *ref,
struct strbuf *buf, int depth) struct strbuf *buf, int depth)
{ {
int err;
if (ref->next) { if (ref->next) {
depth = __synthesize_probe_trace_arg_ref(ref->next, buf, depth = __synthesize_probe_trace_arg_ref(ref->next, buf,
depth + 1); depth + 1);
if (depth < 0) if (depth < 0)
goto out; return depth;
} }
strbuf_addf(buf, "%+ld(", ref->offset); err = strbuf_addf(buf, "%+ld(", ref->offset);
out: return (err < 0) ? err : depth;
return depth;
} }
static int synthesize_probe_trace_arg(struct probe_trace_arg *arg, static int synthesize_probe_trace_arg(struct probe_trace_arg *arg,
struct strbuf *buf) struct strbuf *buf)
{ {
struct probe_trace_arg_ref *ref = arg->ref; struct probe_trace_arg_ref *ref = arg->ref;
int depth = 0; int depth = 0, err;
/* Argument name or separator */ /* Argument name or separator */
if (arg->name) if (arg->name)
strbuf_addf(buf, " %s=", arg->name); err = strbuf_addf(buf, " %s=", arg->name);
else else
strbuf_addch(buf, ' '); err = strbuf_addch(buf, ' ');
if (err)
return err;
/* Special case: @XXX */ /* Special case: @XXX */
if (arg->value[0] == '@' && arg->ref) if (arg->value[0] == '@' && arg->ref)
...@@ -1798,18 +1817,19 @@ static int synthesize_probe_trace_arg(struct probe_trace_arg *arg, ...@@ -1798,18 +1817,19 @@ static int synthesize_probe_trace_arg(struct probe_trace_arg *arg,
/* Print argument value */ /* Print argument value */
if (arg->value[0] == '@' && arg->ref) if (arg->value[0] == '@' && arg->ref)
strbuf_addf(buf, "%s%+ld", arg->value, arg->ref->offset); err = strbuf_addf(buf, "%s%+ld", arg->value, arg->ref->offset);
else else
strbuf_addstr(buf, arg->value); err = strbuf_addstr(buf, arg->value);
/* Closing */ /* Closing */
while (depth--) while (!err && depth--)
strbuf_addch(buf, ')'); err = strbuf_addch(buf, ')');
/* Print argument type */ /* Print argument type */
if (arg->type) if (!err && arg->type)
strbuf_addf(buf, ":%s", arg->type); err = strbuf_addf(buf, ":%s", arg->type);
return 0; return err;
} }
char *synthesize_probe_trace_command(struct probe_trace_event *tev) char *synthesize_probe_trace_command(struct probe_trace_event *tev)
...@@ -1817,15 +1837,18 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev) ...@@ -1817,15 +1837,18 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev)
struct probe_trace_point *tp = &tev->point; struct probe_trace_point *tp = &tev->point;
struct strbuf buf; struct strbuf buf;
char *ret = NULL; char *ret = NULL;
int i; int i, err;
/* Uprobes must have tp->module */ /* Uprobes must have tp->module */
if (tev->uprobes && !tp->module) if (tev->uprobes && !tp->module)
return NULL; return NULL;
strbuf_init(&buf, 32); if (strbuf_init(&buf, 32) < 0)
strbuf_addf(&buf, "%c:%s/%s ", tp->retprobe ? 'r' : 'p', return NULL;
tev->group, tev->event);
if (strbuf_addf(&buf, "%c:%s/%s ", tp->retprobe ? 'r' : 'p',
tev->group, tev->event) < 0)
goto error;
/* /*
* If tp->address == 0, then this point must be a * If tp->address == 0, then this point must be a
* absolute address uprobe. * absolute address uprobe.
...@@ -1839,14 +1862,16 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev) ...@@ -1839,14 +1862,16 @@ char *synthesize_probe_trace_command(struct probe_trace_event *tev)
/* Use the tp->address for uprobes */ /* Use the tp->address for uprobes */
if (tev->uprobes) if (tev->uprobes)
strbuf_addf(&buf, "%s:0x%lx", tp->module, tp->address); err = strbuf_addf(&buf, "%s:0x%lx", tp->module, tp->address);
else if (!strncmp(tp->symbol, "0x", 2)) else if (!strncmp(tp->symbol, "0x", 2))
/* Absolute address. See try_to_find_absolute_address() */ /* Absolute address. See try_to_find_absolute_address() */
strbuf_addf(&buf, "%s%s0x%lx", tp->module ?: "", err = strbuf_addf(&buf, "%s%s0x%lx", tp->module ?: "",
tp->module ? ":" : "", tp->address); tp->module ? ":" : "", tp->address);
else else
strbuf_addf(&buf, "%s%s%s+%lu", tp->module ?: "", err = strbuf_addf(&buf, "%s%s%s+%lu", tp->module ?: "",
tp->module ? ":" : "", tp->symbol, tp->offset); tp->module ? ":" : "", tp->symbol, tp->offset);
if (err)
goto error;
for (i = 0; i < tev->nargs; i++) for (i = 0; i < tev->nargs; i++)
if (synthesize_probe_trace_arg(&tev->args[i], &buf) < 0) if (synthesize_probe_trace_arg(&tev->args[i], &buf) < 0)
...@@ -1960,14 +1985,15 @@ static int convert_to_perf_probe_event(struct probe_trace_event *tev, ...@@ -1960,14 +1985,15 @@ static int convert_to_perf_probe_event(struct probe_trace_event *tev,
if (tev->args[i].name) if (tev->args[i].name)
pev->args[i].name = strdup(tev->args[i].name); pev->args[i].name = strdup(tev->args[i].name);
else { else {
strbuf_init(&buf, 32); if ((ret = strbuf_init(&buf, 32)) < 0)
goto error;
ret = synthesize_probe_trace_arg(&tev->args[i], &buf); ret = synthesize_probe_trace_arg(&tev->args[i], &buf);
pev->args[i].name = strbuf_detach(&buf, NULL); pev->args[i].name = strbuf_detach(&buf, NULL);
} }
if (pev->args[i].name == NULL && ret >= 0) if (pev->args[i].name == NULL && ret >= 0)
ret = -ENOMEM; ret = -ENOMEM;
} }
error:
if (ret < 0) if (ret < 0)
clear_perf_probe_event(pev); clear_perf_probe_event(pev);
...@@ -2140,37 +2166,40 @@ static int perf_probe_event__sprintf(const char *group, const char *event, ...@@ -2140,37 +2166,40 @@ static int perf_probe_event__sprintf(const char *group, const char *event,
const char *module, const char *module,
struct strbuf *result) struct strbuf *result)
{ {
int i; int i, ret;
char *buf; char *buf;
if (asprintf(&buf, "%s:%s", group, event) < 0) if (asprintf(&buf, "%s:%s", group, event) < 0)
return -errno; return -errno;
strbuf_addf(result, " %-20s (on ", buf); ret = strbuf_addf(result, " %-20s (on ", buf);
free(buf); free(buf);
if (ret)
return ret;
/* Synthesize only event probe point */ /* Synthesize only event probe point */
buf = synthesize_perf_probe_point(&pev->point); buf = synthesize_perf_probe_point(&pev->point);
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
strbuf_addstr(result, buf); ret = strbuf_addstr(result, buf);
free(buf); free(buf);
if (module) if (!ret && module)
strbuf_addf(result, " in %s", module); ret = strbuf_addf(result, " in %s", module);
if (pev->nargs > 0) { if (!ret && pev->nargs > 0) {
strbuf_add(result, " with", 5); ret = strbuf_add(result, " with", 5);
for (i = 0; i < pev->nargs; i++) { for (i = 0; !ret && i < pev->nargs; i++) {
buf = synthesize_perf_probe_arg(&pev->args[i]); buf = synthesize_perf_probe_arg(&pev->args[i]);
if (!buf) if (!buf)
return -ENOMEM; return -ENOMEM;
strbuf_addf(result, " %s", buf); ret = strbuf_addf(result, " %s", buf);
free(buf); free(buf);
} }
} }
strbuf_addch(result, ')'); if (!ret)
ret = strbuf_addch(result, ')');
return 0; return ret;
} }
/* Show an event */ /* Show an event */
......
tools/perf/util/probe-finder.c
View file @ bf4d5f25
...@@ -1294,6 +1294,7 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) ...@@ -1294,6 +1294,7 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data)
{ {
struct available_var_finder *af = data; struct available_var_finder *af = data;
struct variable_list *vl; struct variable_list *vl;
struct strbuf buf = STRBUF_INIT;
int tag, ret; int tag, ret;
vl = &af->vls[af->nvls - 1]; vl = &af->vls[af->nvls - 1];
...@@ -1307,25 +1308,26 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) ...@@ -1307,25 +1308,26 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data)
if (ret == 0 || ret == -ERANGE) { if (ret == 0 || ret == -ERANGE) {
int ret2; int ret2;
bool externs = !af->child; bool externs = !af->child;
struct strbuf buf;
strbuf_init(&buf, 64); if (strbuf_init(&buf, 64) < 0)
goto error;
if (probe_conf.show_location_range) { if (probe_conf.show_location_range) {
if (!externs) { if (!externs)
if (ret) ret2 = strbuf_add(&buf,
strbuf_add(&buf, "[INV]\t", 6); ret ? "[INV]\t" : "[VAL]\t", 6);
else else
strbuf_add(&buf, "[VAL]\t", 6); ret2 = strbuf_add(&buf, "[EXT]\t", 6);
} else if (ret2)
strbuf_add(&buf, "[EXT]\t", 6); goto error;
} }
ret2 = die_get_varname(die_mem, &buf); ret2 = die_get_varname(die_mem, &buf);
if (!ret2 && probe_conf.show_location_range && if (!ret2 && probe_conf.show_location_range &&
!externs) { !externs) {
strbuf_addch(&buf, '\t'); if (strbuf_addch(&buf, '\t') < 0)
goto error;
ret2 = die_get_var_range(&af->pf.sp_die, ret2 = die_get_var_range(&af->pf.sp_die,
die_mem, &buf); die_mem, &buf);
} }
...@@ -1334,8 +1336,8 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) ...@@ -1334,8 +1336,8 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data)
if (ret2 == 0) { if (ret2 == 0) {
strlist__add(vl->vars, strlist__add(vl->vars,
strbuf_detach(&buf, NULL)); strbuf_detach(&buf, NULL));
} else }
strbuf_release(&buf); strbuf_release(&buf);
} }
} }
...@@ -1343,6 +1345,10 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data) ...@@ -1343,6 +1345,10 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data)
return DIE_FIND_CB_CONTINUE; return DIE_FIND_CB_CONTINUE;
else else
return DIE_FIND_CB_SIBLING; return DIE_FIND_CB_SIBLING;
error:
strbuf_release(&buf);
pr_debug("Error in strbuf\n");
return DIE_FIND_CB_END;
} }
/* Add a found vars into available variables list */ /* Add a found vars into available variables list */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7