[PATCH 1/2] perf, tools: Fix crash while reading old perf.data

[Andi Kleen]

From: Andi Kleen <ak@xxxxxxxxxxxxxxx>

In some cases when reading perf.data generated by much
older perf I got segfaults with dso->long_name being zero.
This patch fixes them for me.

Haven't tracked down the exact cause. I assume it's
some error path that doesn't set it.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
---
 tools/perf/util/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 52e9490..6266041 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1106,7 +1106,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
 		if (__machine__create_kernel_maps(machine, kernel) < 0)
 			goto out_problem;
 
-		if (strstr(dso->long_name, "vmlinux"))
+		if (dso->long_name && strstr(dso->long_name, "vmlinux"))
 			dso__set_short_name(dso, "[kernel.vmlinux]", false);
 
 		machine__set_kernel_mmap_len(machine, event);
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/