linux-kernel - [PATCH] perf diff: bug fix, donot overwrite build id in dso_

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Tue, 13 Sep 2016 09:29:37 -0700
From:   kan.liang@...el.com
To:     acme@...nel.org
Cc:     linux-kernel@...r.kernel.org, dima@...retsauce.net,
        jolsa@...hat.com, namhyung@...nel.org, andi@...stfloor.org,
        Kan Liang <kan.liang@...el.com>
Subject: [PATCH] perf diff: bug fix, donot overwrite build id in dso__load

From: Kan Liang <kan.liang@...el.com>

This patch fixes a perf diff regression issue which was introduced by:
commit 5baecbcd9c9a ("perf symbols: we can now read separate debug-info
files based on a build ID")

The binary name could be same when perf diff different binaries. Build
id is used to distinguish between them. The unique build id will be set
when processing the header.
However, the previous patch relies on binary name to find build id.
Furthermore, it overwrites the build id regardless of whether the build
id is set or not. That will bring issue when perf diff different
binaries.

This patch prevent the overwrite by checking has_build_id.

Signed-off-by: Kan Liang <kan.liang@...el.com>
---
 tools/perf/util/symbol.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 19c9c55..2392c03 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1444,7 +1444,8 @@ int dso__load(struct dso *dso, struct map *map)
 	 * Read the build id if possible. This is required for
 	 * DSO_BINARY_TYPE__BUILDID_DEBUGINFO to work
 	 */
-	if (is_regular_file(dso->long_name) &&
+	if (!dso->has_build_id &&
+	    is_regular_file(dso->long_name) &&
 	    filename__read_build_id(dso->long_name, build_id, BUILD_ID_SIZE) > 0)
 		dso__set_build_id(dso, build_id);
 
-- 
2.5.5