Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754326AbdC1F7F (ORCPT ); Tue, 28 Mar 2017 01:59:05 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55879 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680AbdC1F7E (ORCPT ); Tue, 28 Mar 2017 01:59:04 -0400 Date: Mon, 27 Mar 2017 22:55:22 -0700 From: tip-bot for Taeung Song Message-ID: Cc: treeze.taeung@gmail.com, tglx@linutronix.de, wangnan0@huawei.com, acme@redhat.com, jolsa@redhat.com, mhiramat@kernel.org, peterz@infradead.org, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mhiramat@kernel.org, peterz@infradead.org, tglx@linutronix.de, jolsa@redhat.com, wangnan0@huawei.com, acme@redhat.com, treeze.taeung@gmail.com In-Reply-To: <1490598638-13947-2-git-send-email-treeze.taeung@gmail.com> References: <1490598638-13947-2-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Fix a bug following symbolic link of a build-id file Git-Commit-ID: 6ebd2547dd24daf95a21b2bc59931de8502afcc3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2584 Lines: 72 Commit-ID: 6ebd2547dd24daf95a21b2bc59931de8502afcc3 Gitweb: http://git.kernel.org/tip/6ebd2547dd24daf95a21b2bc59931de8502afcc3 Author: Taeung Song AuthorDate: Mon, 27 Mar 2017 16:10:36 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 27 Mar 2017 14:58:20 -0300 perf annotate: Fix a bug following symbolic link of a build-id file It is wrong way to read link name from a build-id file. Because a build-id file is not anymore a symbolic link but build-id directory of it is symbolic link, so fix it. For example, if build-id file name gotten from dso__build_id_filename() is as below, /root/.debug/.build-id/4f/75c7d197c951659d1c1b8b5fd49bcdf8f3f8b1/elf To correctly read link name of build-id, use the build-id dir path that is a symbolic link, instead of the above build-id file name like below. /root/.debug/.build-id/4f/75c7d197c951659d1c1b8b5fd49bcdf8f3f8b1 Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1490598638-13947-2-git-send-email-treeze.taeung@gmail.com Fixes: 01412261d994 ("perf buildid-cache: Use path/to/bin/buildid/elf instead of path/to/bin/buildid") Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 3d0263e..6dc9148 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1307,6 +1307,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil { char linkname[PATH_MAX]; char *build_id_filename; + char *build_id_path = NULL; if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore(dso)) @@ -1322,8 +1323,14 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil goto fallback; } + build_id_path = strdup(filename); + if (!build_id_path) + return -1; + + dirname(build_id_path); + if (dso__is_kcore(dso) || - readlink(filename, linkname, sizeof(linkname)) < 0 || + readlink(build_id_path, linkname, sizeof(linkname)) < 0 || strstr(linkname, DSO__NAME_KALLSYMS) || access(filename, R_OK)) { fallback: @@ -1335,6 +1342,7 @@ fallback: __symbol__join_symfs(filename, filename_size, dso->long_name); } + free(build_id_path); return 0; }