From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161018AbcE2SUG (ORCPT ); Sun, 29 May 2016 14:20:06 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56350 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752986AbcE2SUB (ORCPT ); Sun, 29 May 2016 14:20:01 -0400 Date: Sun, 29 May 2016 11:19:40 -0700 From: tip-bot for Wang Nan Message-ID: Cc: acme@redhat.com, lizefan@huawei.com, tglx@linutronix.de, wangnan0@huawei.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, lizefan@huawei.com, wangnan0@huawei.com, tglx@linutronix.de In-Reply-To: <1464081688-167940-2-git-send-email-wangnan0@huawei.com> References: <1464081688-167940-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf record: Fix crash when kptr is restricted Git-Commit-ID: 3dc6c1d54ff4cc9ce7e8513c286c970304cde20b 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: 3dc6c1d54ff4cc9ce7e8513c286c970304cde20b Gitweb: http://git.kernel.org/tip/3dc6c1d54ff4cc9ce7e8513c286c970304cde20b Author: Wang Nan AuthorDate: Tue, 24 May 2016 09:21:28 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 27 May 2016 09:41:39 -0300 perf record: Fix crash when kptr is restricted Before this patch, a simple 'perf record' could fail if kptr_restrict is set to 1 (for normal user) or 2 (for root): # perf record ls WARNING: Kernel address maps (/proc/{kallsyms,modules}) are restricted, check /proc/sys/kernel/kptr_restrict. Samples in kernel functions may not be resolved if a suitable vmlinux file is not found in the buildid cache or in the vmlinux path. Samples in kernel modules won't be resolved at all. If some relocation was applied (e.g. kexec) symbols may be misresolved even with a suitable vmlinux or kallsyms file. Segmentation fault (core dumped) This patch skips perf_event__synthesize_kernel_mmap() when kptr is not available. Signed-off-by: Wang Nan Tested-by: Arnaldo Carvalho de Melo Fixes: 45e90056904b ("perf machine: Do not bail out if not managing to read ref reloc symbol") Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1464081688-167940-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/event.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index f6fcc68..9b141f1 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -673,6 +673,8 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool, int err; union perf_event *event; + if (symbol_conf.kptr_restrict) + return -1; if (map == NULL) return -1;