From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966071AbcIHJtO (ORCPT ); Thu, 8 Sep 2016 05:49:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39796 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966049AbcIHJtK (ORCPT ); Thu, 8 Sep 2016 05:49:10 -0400 Date: Thu, 8 Sep 2016 02:48:16 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: keescook@chromium.org, peterz@infradead.org, tglx@linutronix.de, luto@amacapital.net, rostedt@goodmis.org, brgerst@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, nilayvaish@gmail.com, jpoimboe@redhat.com, mingo@kernel.org, torvalds@linux-foundation.org, byungchul.park@lge.com, fweisbec@gmail.com Reply-To: torvalds@linux-foundation.org, fweisbec@gmail.com, byungchul.park@lge.com, mingo@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, nilayvaish@gmail.com, brgerst@gmail.com, rostedt@goodmis.org, luto@amacapital.net, tglx@linutronix.de, keescook@chromium.org, peterz@infradead.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] perf/x86: Check perf_callchain_store() error Git-Commit-ID: 019e579d395733d14097c2d29c8c43226dad1617 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: 019e579d395733d14097c2d29c8c43226dad1617 Gitweb: http://git.kernel.org/tip/019e579d395733d14097c2d29c8c43226dad1617 Author: Josh Poimboeuf AuthorDate: Wed, 24 Aug 2016 11:50:14 -0500 Committer: Ingo Molnar CommitDate: Thu, 8 Sep 2016 08:58:40 +0200 perf/x86: Check perf_callchain_store() error Add a check to perf_callchain_kernel() so that it returns early if the callchain entry array is already full. Signed-off-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Brian Gerst Cc: Byungchul Park Cc: Frederic Weisbecker Cc: Kees Cook Cc: Linus Torvalds Cc: Nilay Vaish Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/dce6d60bab08be2600efd90021d9b85620646161.1472057064.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index d0efb5c..c1319ac 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2277,7 +2277,8 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re return; } - perf_callchain_store(entry, regs->ip); + if (perf_callchain_store(entry, regs->ip)) + return; dump_trace(NULL, regs, NULL, 0, &backtrace_ops, entry); }