Commit 6dd3b8c9 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar

x86/kprobes: Fix to check non boostable prefixes correctly

There are 2 bugs in the can_boost() function because of using
x86 insn decoder. Since the insn->opcode never has a prefix byte,
it can not find CS override prefix in it. And the insn->attr is
the attribute of the opcode, thus inat_is_address_size_prefix(
insn->attr) always returns false.

Fix those by checking each prefix bytes with for_each_insn_prefix
loop and getting the correct attribute for each prefix byte.
Also, this removes unlikely, because this is a slow path.

Fixes: a8d11cd0 ("kprobes/x86: Consolidate insn decoder users for copying code")
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/161666691162.1120877.2808435205294352583.stgit@devnote2
parent 6256e668
...@@ -139,6 +139,8 @@ NOKPROBE_SYMBOL(synthesize_relcall); ...@@ -139,6 +139,8 @@ NOKPROBE_SYMBOL(synthesize_relcall);
int can_boost(struct insn *insn, void *addr) int can_boost(struct insn *insn, void *addr)
{ {
kprobe_opcode_t opcode; kprobe_opcode_t opcode;
insn_byte_t prefix;
int i;
if (search_exception_tables((unsigned long)addr)) if (search_exception_tables((unsigned long)addr))
return 0; /* Page fault may occur on this address. */ return 0; /* Page fault may occur on this address. */
...@@ -151,9 +153,14 @@ int can_boost(struct insn *insn, void *addr) ...@@ -151,9 +153,14 @@ int can_boost(struct insn *insn, void *addr)
if (insn->opcode.nbytes != 1) if (insn->opcode.nbytes != 1)
return 0; return 0;
/* Can't boost Address-size override prefix */ for_each_insn_prefix(insn, i, prefix) {
if (unlikely(inat_is_address_size_prefix(insn->attr))) insn_attr_t attr;
attr = inat_get_opcode_attribute(prefix);
/* Can't boost Address-size override prefix and CS override prefix */
if (prefix == 0x2e || inat_is_address_size_prefix(attr))
return 0; return 0;
}
opcode = insn->opcode.bytes[0]; opcode = insn->opcode.bytes[0];
...@@ -181,8 +188,8 @@ int can_boost(struct insn *insn, void *addr) ...@@ -181,8 +188,8 @@ int can_boost(struct insn *insn, void *addr)
/* indirect jmp is boostable */ /* indirect jmp is boostable */
return X86_MODRM_REG(insn->modrm.bytes[0]) == 4; return X86_MODRM_REG(insn->modrm.bytes[0]) == 4;
default: default:
/* CS override prefix and call are not boostable */ /* call is not boostable */
return (opcode != 0x2e && opcode != 0x9a); return opcode != 0x9a;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment