Rather than using hard-coded values of the segment override prefixes,
leverage the existing definitions provided in inat.h.

Suggested-by: Borislav Petkov <b...@suse.de>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Borislav Petkov <b...@suse.de>
Cc: Masami Hiramatsu <mhira...@kernel.org>
Cc: Denys Vlasenko <dvlas...@redhat.com>
Cc: Srikar Dronamraju <sri...@linux.vnet.ibm.com>
Cc: Ravi V. Shankar <ravi.v.shan...@intel.com>
Signed-off-by: Ricardo Neri <ricardo.neri-calde...@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 495c776de4b4..a3755d293a48 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;
                }
        }
-- 
2.13.0

Reply via email to