Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0c188a07b6a399e3df66534c29fef0a2082aaf57

Authored by Masami Hiramatsu
Committed by Jiri Olsa
1 parent b69cf53640
Exists in ti-lsk-linux-4.1.y and in 12 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y

perf probe: Fix a segfault if asked for variable it doesn't find 

Fix a segfault bug by asking for variable it doesn't find.
Since the convert_variable() didn't handle error code returned
from convert_variable_location(), it just passed an incomplete
variable field and then a segfault was occurred when formatting
the field.

This fixes that bug by handling success code correctly in
convert_variable(). Other callers of convert_variable_location()
are correctly checking the return code.

This bug was introduced by following commit. But another hidden
erroneous error handling has been there previously (-ENOMEM case).

 commit 3d918a12a1b3088ac16ff37fa52760639d6e2403

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20140529105232.28251.30447.stgit@ltc230.yrl.intra.hitachi.co.jp
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

tools/perf/util/probe-finder.c
Diff comments   View file @ 0c188a0
... ... @@ -511,12 +511,12 @@
511 511  
512 512 ret = convert_variable_location(vr_die, pf->addr, pf->fb_ops,
513 513 &pf->sp_die, pf->tvar);
514   - if (ret == -ENOENT)
  514 + if (ret == -ENOENT || ret == -EINVAL)
515 515 pr_err("Failed to find the location of %s at this address.\n"
516 516 " Perhaps, it has been optimized out.\n", pf->pvar->var);
517 517 else if (ret == -ENOTSUP)
518 518 pr_err("Sorry, we don't support this variable location yet.\n");
519   - else if (pf->pvar->field) {
  519 + else if (ret == 0 && pf->pvar->field) {
520 520 ret = convert_variable_fields(vr_die, pf->pvar->var,
521 521 pf->pvar->field, &pf->tvar->ref,
522 522 &die_mem);