diff options
| author | Nadav Amit <namit@vmware.com> | 2022-08-13 15:59:43 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-08-14 11:27:17 +0200 |
| commit | 8924779df820c53875abaeb10c648e9cb75b46d4 (patch) | |
| tree | 2018f44948641800482808fa1fd6724ef0e83de9 /arch/x86 | |
| parent | ffcf9c5700e49c0aee42dcba9a12ba21338e8136 (diff) | |
| download | linux-stable-8924779df820c53875abaeb10c648e9cb75b46d4.tar.gz linux-stable-8924779df820c53875abaeb10c648e9cb75b46d4.tar.bz2 linux-stable-8924779df820c53875abaeb10c648e9cb75b46d4.zip | |
x86/kprobes: Fix JNG/JNLE emulation
When kprobes emulates JNG/JNLE instructions on x86 it uses the wrong
condition. For JNG (opcode: 0F 8E), according to Intel SDM, the jump is
performed if (ZF == 1 or SF != OF). However the kernel emulation
currently uses 'and' instead of 'or'.
As a result, setting a kprobe on JNG/JNLE might cause the kernel to
behave incorrectly whenever the kprobe is hit.
Fix by changing the 'and' to 'or'.
Fixes: 6256e668b7af ("x86/kprobes: Use int3 instead of debug trap for single-step")
Signed-off-by: Nadav Amit <namit@vmware.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220813225943.143767-1-namit@vmware.com
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/kprobes/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 74167dc5f55e..4c3c27b6aea3 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -505,7 +505,7 @@ static void kprobe_emulate_jcc(struct kprobe *p, struct pt_regs *regs) match = ((regs->flags & X86_EFLAGS_SF) >> X86_EFLAGS_SF_BIT) ^ ((regs->flags & X86_EFLAGS_OF) >> X86_EFLAGS_OF_BIT); if (p->ainsn.jcc.type >= 0xe) - match = match && (regs->flags & X86_EFLAGS_ZF); + match = match || (regs->flags & X86_EFLAGS_ZF); } __kprobe_emulate_jmp(p, regs, (match && !invert) || (!match && invert)); } |