From: Brian Gerst <brgerst@gmail.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
Denys Vlasenko <dvlasenk@redhat.com>,
Andy Lutomirski <luto@amacapital.net>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 2/7] x86/vm86: Preserve orig_ax
Date: Thu, 16 Jul 2015 07:46:02 -0400 [thread overview]
Message-ID: <1437047167-5634-3-git-send-email-brgerst@gmail.com> (raw)
In-Reply-To: <1437047167-5634-1-git-send-email-brgerst@gmail.com>
There is no legitimate reason for usermode to modify the orig_ax field on
entry to vm86 mode, so copy it from the 32-bit regs.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/kernel/vm86_32.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index 75eab83..8424290 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -294,6 +294,8 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
info->regs.pt.flags |= info->regs32->flags & ~SAFE_MASK;
info->regs.pt.flags |= X86_VM_MASK;
+ info->regs.pt.orig_ax = info->regs32->orig_ax;
+
switch (info->cpu_type) {
case CPU_286:
tsk->thread.v86mask = 0;
--
2.4.3
next prev parent reply other threads:[~2015-07-16 11:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 11:46 [PATCH v2] x86: vm86 cleanups Brian Gerst
2015-07-16 11:46 ` [PATCH 1/7] x86/vm86: Clean up saved_fs/gs Brian Gerst
2015-07-16 15:45 ` Andy Lutomirski
2015-07-16 15:57 ` Brian Gerst
2015-07-16 11:46 ` Brian Gerst [this message]
2015-07-16 15:57 ` [PATCH 2/7] x86/vm86: Preserve orig_ax Andy Lutomirski
2015-07-16 11:46 ` [PATCH 3/7] x86/vm86: Move userspace accesses to do_sys_vm86() Brian Gerst
2015-07-16 15:42 ` Andy Lutomirski
2015-07-16 16:02 ` Brian Gerst
2015-07-16 11:46 ` [PATCH 4/7] x86/vm86: Move vm86 fields out of thread_struct Brian Gerst
2015-07-17 19:01 ` Andy Lutomirski
2015-07-16 11:46 ` [PATCH 5/7] x86/vm86: Move fields from kernel_vm86_struct Brian Gerst
2015-07-17 19:02 ` Andy Lutomirski
2015-07-16 11:46 ` [PATCH 6/7] x86/vm86: Eliminate kernel_vm86_struct Brian Gerst
2015-07-17 19:05 ` Andy Lutomirski
2015-07-16 11:46 ` [PATCH 7/7] x86/vm86: Use the normal pt_regs area for vm86 Brian Gerst
-- strict thread matches above, loose matches on Subject: below --
2015-07-20 1:09 [PATCH v3] x86: vm86 cleanups Brian Gerst
2015-07-20 1:09 ` [PATCH 2/7] x86/vm86: Preserve orig_ax Brian Gerst
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=1437047167-5634-3-git-send-email-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=dvlasenk@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=torvalds@linux-foundation.org \
--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).