From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252AbaKYJxY (ORCPT ); Tue, 25 Nov 2014 04:53:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50512 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbaKYJxW (ORCPT ); Tue, 25 Nov 2014 04:53:22 -0500 Date: Tue, 25 Nov 2014 10:53:04 +0100 From: Jiri Olsa To: Andi Kleen Cc: acme@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, Andi Kleen Subject: Re: [PATCH 1/2] perf, tools: Fix crash while reading old perf.data Message-ID: <20141125095303.GD30861@krava.brq.redhat.com> References: <1416605880-25055-1-git-send-email-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1416605880-25055-1-git-send-email-andi@firstfloor.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 21, 2014 at 01:37:59PM -0800, Andi Kleen wrote: > From: Andi Kleen > > 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. Any chance this patch fixies it for you? 330dfa224fcc perf tools: Fix segfault due to invalid kernel dso access it's on latest acme/perf/core jirka > > Signed-off-by: Andi Kleen > --- > 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 >