From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938110AbdAEHzq (ORCPT ); Thu, 5 Jan 2017 02:55:46 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57270 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760261AbdAEHzh (ORCPT ); Thu, 5 Jan 2017 02:55:37 -0500 Date: Wed, 4 Jan 2017 23:53:37 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: adrian.hunter@intel.com, wangnan0@huawei.com, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, markus@trippelsdorf.de Reply-To: hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, markus@trippelsdorf.de, wangnan0@huawei.com, acme@redhat.com, adrian.hunter@intel.com, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf symbols: Robustify reading of build-id from sysfs Git-Commit-ID: 7934c98a6e04028eb34c1293bfb5a6b0ab630b66 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: 7934c98a6e04028eb34c1293bfb5a6b0ab630b66 Gitweb: http://git.kernel.org/tip/7934c98a6e04028eb34c1293bfb5a6b0ab630b66 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 3 Jan 2017 15:19:21 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 3 Jan 2017 16:11:13 -0300 perf symbols: Robustify reading of build-id from sysfs Markus reported that perf segfaults when reading /sys/kernel/notes from a kernel linked with GNU gold, due to what looks like a gold bug, so do some bounds checking to avoid crashing in that case. Reported-by: Markus Trippelsdorf Report-Link: http://lkml.kernel.org/r/20161219161821.GA294@x4 Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ryhgs6a6jxvz207j2636w31c@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 99400b0..adbc6c0 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -537,6 +537,12 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size) break; } else { int n = namesz + descsz; + + if (n > (int)sizeof(bf)) { + n = sizeof(bf); + pr_debug("%s: truncating reading of build id in sysfs file %s: n_namesz=%u, n_descsz=%u.\n", + __func__, filename, nhdr.n_namesz, nhdr.n_descsz); + } if (read(fd, bf, n) != n) break; }