From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754516AbdC1GAx (ORCPT ); Tue, 28 Mar 2017 02:00:53 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34261 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754493AbdC1GAv (ORCPT ); Tue, 28 Mar 2017 02:00:51 -0400 Date: Mon, 27 Mar 2017 22:56:57 -0700 From: tip-bot for Tommi Rantala Message-ID: Cc: linux-kernel@vger.kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, tommi.t.rantala@nokia.com Reply-To: alexander.shishkin@linux.intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, tommi.t.rantala@nokia.com, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <20170322130624.21881-3-tommi.t.rantala@nokia.com> References: <20170322130624.21881-3-tommi.t.rantala@nokia.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf buildid: Do not assume that readlink() returns a null terminated string Git-Commit-ID: 5a2342111c68e623e27ee7ea3d0492d8dad6bda0 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 Commit-ID: 5a2342111c68e623e27ee7ea3d0492d8dad6bda0 Gitweb: http://git.kernel.org/tip/5a2342111c68e623e27ee7ea3d0492d8dad6bda0 Author: Tommi Rantala AuthorDate: Wed, 22 Mar 2017 15:06:20 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 27 Mar 2017 15:35:06 -0300 perf buildid: Do not assume that readlink() returns a null terminated string Valgrind was complaining: $ valgrind ./perf list >/dev/null ==11643== Memcheck, a memory error detector ==11643== Copyright (C) 2002-2015, and GNU GPL'd, by Julian Seward et al. ==11643== Using Valgrind-3.12.0 and LibVEX; rerun with -h for copyright info ==11643== Command: ./perf list ==11643== ==11643== Conditional jump or move depends on uninitialised value(s) ==11643== at 0x4C30620: rindex (vg_replace_strmem.c:199) ==11643== by 0x49DAA9: build_id_cache__origname (build-id.c:198) ==11643== by 0x49E1C7: build_id_cache__valid_id (build-id.c:222) ==11643== by 0x49E1C7: build_id_cache__list_all (build-id.c:507) ==11643== by 0x4B9C8F: print_sdt_events (parse-events.c:2067) ==11643== by 0x4BB0B3: print_events (parse-events.c:2313) ==11643== by 0x439501: cmd_list (builtin-list.c:53) ==11643== by 0x497150: run_builtin (perf.c:359) ==11643== by 0x428CE0: handle_internal_command (perf.c:421) ==11643== by 0x428CE0: run_argv (perf.c:467) ==11643== by 0x428CE0: main (perf.c:614) [...] Additionally, a zero length result from readlink() is not very interesting. Signed-off-by: Tommi Rantala Cc: Alexander Shishkin Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170322130624.21881-3-tommi.t.rantala@nokia.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/build-id.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 234859f..33af675 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -182,13 +182,17 @@ char *build_id_cache__origname(const char *sbuild_id) char buf[PATH_MAX]; char *ret = NULL, *p; size_t offs = 5; /* == strlen("../..") */ + ssize_t len; linkname = build_id_cache__linkname(sbuild_id, NULL, 0); if (!linkname) return NULL; - if (readlink(linkname, buf, PATH_MAX) < 0) + len = readlink(linkname, buf, sizeof(buf) - 1); + if (len <= 0) goto out; + buf[len] = '\0'; + /* The link should be "../../" */ p = strrchr(buf, '/'); /* Cut off the "/" */ if (p && (p > buf + offs)) {