From: Li Huafei <lihuafei1@huawei.com>
To: <stable@vger.kernel.org>
Cc: <gregkh@linuxfoundation.org>, <mhiramat@kernel.org>,
<tglx@linutronix.de>, <mingo@redhat.com>, <bp@alien8.de>,
<x86@kernel.org>, <hpa@zytor.com>, <sashal@kernel.org>,
<peterz@infradead.org>, <linux-kernel@vger.kernel.org>,
<xukuohai@huawei.com>, <natechancellor@gmail.com>,
<ndesaulniers@google.com>, <rostedt@goodmis.org>,
<weiyongjun1@huawei.com>, <gustavoars@kernel.org>,
<namit@vmware.com>, <laijs@linux.alibaba.com>,
<clang-built-linux@googlegroups.com>, <lihuafei1@huawei.com>
Subject: [PATCH 5.10 9/9] x86/kprobes: Fix JNG/JNLE emulation
Date: Wed, 5 Jul 2023 14:46:53 +0800 [thread overview]
Message-ID: <20230705064653.226811-10-lihuafei1@huawei.com> (raw)
In-Reply-To: <20230705064653.226811-1-lihuafei1@huawei.com>
From: Nadav Amit <namit@vmware.com>
[ Upstream commit 8924779df820c53875abaeb10c648e9cb75b46d4 ]
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
Signed-off-by: Li Huafei <lihuafei1@huawei.com>
---
arch/x86/kernel/kprobes/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index bde43592f54a..c78b4946385e 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));
}
--
2.17.1
next prev parent reply other threads:[~2023-07-05 6:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-05 6:46 [PATCH 5.10 0/9] x86/kprobes: Fix kprobe debug exception handling logic Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 1/9] kprobes/x86: Fix fall-through warnings for Clang Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 2/9] x86/kprobes: Do not decode opcode in resume_execution() Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 3/9] x86/kprobes: Retrieve correct opcode for group instruction Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 4/9] x86/kprobes: Identify far indirect JMP correctly Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 5/9] x86/kprobes: Use int3 instead of debug trap for single-step Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 6/9] x86/kprobes: Fix to identify indirect jmp and others using range case Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 7/9] x86/kprobes: Move 'inline' to the beginning of the kprobe_is_ss() declaration Li Huafei
2023-07-05 6:46 ` [PATCH 5.10 8/9] x86/kprobes: Update kcb status flag after singlestepping Li Huafei
2023-07-05 6:46 ` Li Huafei [this message]
2023-08-04 9:57 ` [PATCH 5.10 0/9] x86/kprobes: Fix kprobe debug exception handling logic Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230705064653.226811-10-lihuafei1@huawei.com \
--to=lihuafei1@huawei.com \
--cc=bp@alien8.de \
--cc=clang-built-linux@googlegroups.com \
--cc=gregkh@linuxfoundation.org \
--cc=gustavoars@kernel.org \
--cc=hpa@zytor.com \
--cc=laijs@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namit@vmware.com \
--cc=natechancellor@gmail.com \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=weiyongjun1@huawei.com \
--cc=x86@kernel.org \
--cc=xukuohai@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®