From: Andy Lutomirski <luto@kernel.org>
To: x86@kernel.org, LKML <linux-kernel@vger.kernel.org>
Cc: Borislav Petkov <bp@alien8.de>, Stas Sergeev <stsp@list.ru>,
bartoldeman@gmail.com, Brian Gerst <brgerst@gmail.com>,
Andy Lutomirski <luto@kernel.org>,
stable@vger.kernel.org
Subject: [PATCH 3/3] x86/vm86/32: Fix POPF emulation
Date: Tue, 13 Mar 2018 22:03:12 -0700 [thread overview]
Message-ID: <ce95f40556e7b2178b6bc06ee9557827ff94bd28.1521003603.git.luto@kernel.org> (raw)
In-Reply-To: <cover.1521003603.git.luto@kernel.org>
In-Reply-To: <cover.1521003603.git.luto@kernel.org>
POPF would trap if VIP was set regardless of whether IF was set. Fix it.
Reported-by: Bart Oldeman <bartoldeman@gmail.com>
Suggested-by: Stas Sergeev <stsp@list.ru>
Cc: stable@vger.kernel.org
Fixes: 5ed92a8ab71f ("x86/vm86: Use the normal pt_regs area for vm86")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
arch/x86/kernel/vm86_32.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index 5edb27f1a2c4..9d0b5af7db91 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -727,7 +727,8 @@ void handle_vm86_fault(struct kernel_vm86_regs *regs, long error_code)
return;
check_vip:
- if (VEFLAGS & X86_EFLAGS_VIP) {
+ if ((VEFLAGS & (X86_EFLAGS_VIP | X86_EFLAGS_VIF)) ==
+ (X86_EFLAGS_VIP | X86_EFLAGS_VIF)) {
save_v86_state(regs, VM86_STI);
return;
}
--
2.14.3
next prev parent reply other threads:[~2018-03-14 5:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 5:03 [PATCH 0/3] x86/vm86/32: A bugfix and a matching test improvement Andy Lutomirski
2018-03-14 5:03 ` [PATCH 1/3] selftests/x86/entry_from_vm86: Exit with 1 if we fail Andy Lutomirski
2018-03-14 8:46 ` [tip:x86/pti] " tip-bot for Andy Lutomirski
2018-03-14 5:03 ` [PATCH 2/3] selftests/x86/entry_from_vm86: Add test cases for POPF Andy Lutomirski
2018-03-14 8:46 ` [tip:x86/pti] " tip-bot for Andy Lutomirski
2018-03-14 5:03 ` Andy Lutomirski [this message]
2018-03-14 8:47 ` [tip:x86/pti] x86/vm86/32: Fix POPF emulation tip-bot for Andy Lutomirski
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=ce95f40556e7b2178b6bc06ee9557827ff94bd28.1521003603.git.luto@kernel.org \
--to=luto@kernel.org \
--cc=bartoldeman@gmail.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=stsp@list.ru \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).