github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

x86/kprobes: Fix to check non boostable prefixes correctly

Browse Source 
[ Upstream commit 6dd3b8c9f5 ]

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: a8d11cd071 ("kprobes/x86: Consolidate insn decoder users for copying code")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/161666691162.1120877.2808435205294352583.stgit@devnote2
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Masami Hiramatsu 2021-03-25 19:08:31 +09:00 committed by Greg Kroah-Hartman
parent e2ff41d2ee
commit 296da2049f
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/x86/kernel/kprobes/core.c
View File

@ -159,6 +159,8 @@ NOKPROBE_SYMBOL(skip_prefixes);
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. */
@ -171,9 +173,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;
return 0;
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;
}
opcode = insn->opcode.bytes[0]; opcode = insn->opcode.bytes[0];
@ -198,8 +205,8 @@ int can_boost(struct insn *insn, void *addr)
/* clear and set flags are boostable */ /* clear and set flags are boostable */
return (opcode == 0xf5 || (0xf7 < opcode && opcode < 0xfe)); return (opcode == 0xf5 || (0xf7 < opcode && opcode < 0xfe));
default: default:
/* CS override prefix and call are not boostable */ /* call is not boostable */
return (opcode != 0x2e && opcode != 0x9a); return opcode != 0x9a;
} }
} }