From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753274AbdDLHhz (ORCPT ); Wed, 12 Apr 2017 03:37:55 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43859 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751212AbdDLHhw (ORCPT ); Wed, 12 Apr 2017 03:37:52 -0400 Date: Wed, 12 Apr 2017 00:32:00 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: mhiramat@kernel.org, linux-kernel@vger.kernel.org, brgerst@gmail.com, dvlasenk@redhat.com, davem@davemloft.net, bp@alien8.de, ananth@linux.vnet.ibm.com, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, jpoimboe@redhat.com, mingo@kernel.org, tglx@linutronix.de, aryabinin@virtuozzo.com, xiaolong.ye@intel.com, anil.s.keshavamurthy@intel.com Reply-To: ananth@linux.vnet.ibm.com, bp@alien8.de, davem@davemloft.net, dvlasenk@redhat.com, brgerst@gmail.com, linux-kernel@vger.kernel.org, mhiramat@kernel.org, anil.s.keshavamurthy@intel.com, xiaolong.ye@intel.com, aryabinin@virtuozzo.com, mingo@kernel.org, tglx@linutronix.de, jpoimboe@redhat.com, peterz@infradead.org, hpa@zytor.com, torvalds@linux-foundation.org In-Reply-To: <149076340615.22469.14066273186134229909.stgit@devbox> References: <149076340615.22469.14066273186134229909.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] kprobes/x86: Fix kprobe-booster not to boost far call instructions Git-Commit-ID: bd0b90676c30fe640e7ead919b3e38846ac88ab7 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: bd0b90676c30fe640e7ead919b3e38846ac88ab7 Gitweb: http://git.kernel.org/tip/bd0b90676c30fe640e7ead919b3e38846ac88ab7 Author: Masami Hiramatsu AuthorDate: Wed, 29 Mar 2017 13:56:56 +0900 Committer: Ingo Molnar CommitDate: Wed, 12 Apr 2017 09:23:44 +0200 kprobes/x86: Fix kprobe-booster not to boost far call instructions Fix the kprobe-booster not to boost far call instruction, because a call may store the address in the single-step execution buffer to the stack, which should be modified after single stepping. Currently, this instruction will be filtered as not boostable in resume_execution(), so this is not a critical issue. Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: Andrey Ryabinin Cc: Anil S Keshavamurthy Cc: Borislav Petkov Cc: Brian Gerst Cc: David S . Miller Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ye Xiaolong Link: http://lkml.kernel.org/r/149076340615.22469.14066273186134229909.stgit@devbox Signed-off-by: Ingo Molnar --- arch/x86/kernel/kprobes/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 993fa4f..9eae5a6 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -200,6 +200,8 @@ retry: return (opcode != 0x62 && opcode != 0x67); case 0x70: return 0; /* can't boost conditional jump */ + case 0x90: + return opcode != 0x9a; /* can't boost call far */ case 0xc0: /* can't boost software-interruptions */ return (0xc1 < opcode && opcode < 0xcc) || opcode == 0xcf;