From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933348AbdKAVDP (ORCPT ); Wed, 1 Nov 2017 17:03:15 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54359 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933319AbdKAVDN (ORCPT ); Wed, 1 Nov 2017 17:03:13 -0400 Date: Wed, 1 Nov 2017 13:56:17 -0700 From: tip-bot for Ricardo Neri Message-ID: Cc: pbonzini@redhat.com, ray.huang@amd.com, luto@kernel.org, hpa@zytor.com, brgerst@gmail.com, srikar@linux.vnet.ibm.com, akpm@linux-foundation.org, corbet@lwn.net, shuah@kernel.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, cmetcalf@mellanox.com, mst@redhat.com, bp@suse.de, ravi.v.shankar@intel.com, vbabka@suse.cz, mingo@kernel.org, peterz@infradead.org, paul.gortmaker@windriver.com, mhiramat@kernel.org, dave.hansen@linux.intel.com, slaoub@gmail.com, jslaby@suse.cz, ricardo.neri-calderon@linux.intel.com, tglx@linutronix.de Reply-To: corbet@lwn.net, shuah@kernel.org, srikar@linux.vnet.ibm.com, akpm@linux-foundation.org, pbonzini@redhat.com, ray.huang@amd.com, brgerst@gmail.com, hpa@zytor.com, luto@kernel.org, dave.hansen@linux.intel.com, tglx@linutronix.de, slaoub@gmail.com, ricardo.neri-calderon@linux.intel.com, jslaby@suse.cz, mingo@kernel.org, paul.gortmaker@windriver.com, peterz@infradead.org, mhiramat@kernel.org, ravi.v.shankar@intel.com, vbabka@suse.cz, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mst@redhat.com, cmetcalf@mellanox.com, bp@suse.de In-Reply-To: <1509135945-13762-5-git-send-email-ricardo.neri-calderon@linux.intel.com> References: <1509135945-13762-5-git-send-email-ricardo.neri-calderon@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mpx] uprobes/x86: Use existing definitions for segment override prefixes Git-Commit-ID: ed40a10431701d683bfd59f7ca01a8c97408cf67 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: ed40a10431701d683bfd59f7ca01a8c97408cf67 Gitweb: https://git.kernel.org/tip/ed40a10431701d683bfd59f7ca01a8c97408cf67 Author: Ricardo Neri AuthorDate: Fri, 27 Oct 2017 13:25:31 -0700 Committer: Thomas Gleixner CommitDate: Wed, 1 Nov 2017 21:50:08 +0100 uprobes/x86: Use existing definitions for segment override prefixes Rather than using hard-coded values of the segment override prefixes, leverage the existing definitions provided in inat.h. Suggested-by: Borislav Petkov Signed-off-by: Ricardo Neri Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Cc: Srikar Dronamraju Cc: "Michael S. Tsirkin" Cc: Peter Zijlstra Cc: Dave Hansen Cc: ricardo.neri@intel.com Cc: Paul Gortmaker Cc: Huang Rui Cc: Shuah Khan Cc: Jonathan Corbet Cc: Jiri Slaby Cc: "Ravi V. Shankar" Cc: Denys Vlasenko Cc: Chris Metcalf Cc: Brian Gerst Cc: Andy Lutomirski Cc: Chen Yucong Cc: Vlastimil Babka Cc: Masami Hiramatsu Cc: Paolo Bonzini Cc: Andrew Morton Link: https://lkml.kernel.org/r/1509135945-13762-5-git-send-email-ricardo.neri-calderon@linux.intel.com --- arch/x86/kernel/uprobes.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index 495c776..a3755d2 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -271,12 +271,15 @@ static bool is_prefix_bad(struct insn *insn) int i; for (i = 0; i < insn->prefixes.nbytes; i++) { - switch (insn->prefixes.bytes[i]) { - case 0x26: /* INAT_PFX_ES */ - case 0x2E: /* INAT_PFX_CS */ - case 0x36: /* INAT_PFX_DS */ - case 0x3E: /* INAT_PFX_SS */ - case 0xF0: /* INAT_PFX_LOCK */ + insn_attr_t attr; + + attr = inat_get_opcode_attribute(insn->prefixes.bytes[i]); + switch (attr) { + case INAT_MAKE_PREFIX(INAT_PFX_ES): + case INAT_MAKE_PREFIX(INAT_PFX_CS): + case INAT_MAKE_PREFIX(INAT_PFX_DS): + case INAT_MAKE_PREFIX(INAT_PFX_SS): + case INAT_MAKE_PREFIX(INAT_PFX_LOCK): return true; } }