linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Brian Gerst <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: brgerst@gmail.com, linux-kernel@vger.kernel.org,
	dvlasenk@redhat.com, mingo@kernel.org, tglx@linutronix.de,
	hpa@zytor.com, luto@amacapital.net,
	torvalds@linux-foundation.org, peterz@infradead.org
Subject: [tip:x86/asm] x86/entry/vm86: Preserve 'orig_ax'
Date: Tue, 21 Jul 2015 02:39:17 -0700	[thread overview]
Message-ID: <tip-df1ae9a5dc66d9fd57109240042372b1065d984a@git.kernel.org> (raw)
In-Reply-To: <1437354550-25858-3-git-send-email-brgerst@gmail.com>

Commit-ID:  df1ae9a5dc66d9fd57109240042372b1065d984a
Gitweb:     http://git.kernel.org/tip/df1ae9a5dc66d9fd57109240042372b1065d984a
Author:     Brian Gerst <brgerst@gmail.com>
AuthorDate: Sun, 19 Jul 2015 21:09:05 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 21 Jul 2015 09:12:23 +0200

x86/entry/vm86: Preserve 'orig_ax'

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>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1437354550-25858-3-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 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 761a2f9..9a2dc80 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;

  reply	other threads:[~2015-07-21  9:39 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-20  1:09 [PATCH v3] x86: vm86 cleanups Brian Gerst
2015-07-20  1:09 ` [PATCH 1/7] x86/vm86: Clean up saved_fs/gs Brian Gerst
2015-07-21  9:38   ` [tip:x86/asm] x86/entry/vm86: " tip-bot for Brian Gerst
2015-07-20  1:09 ` [PATCH 2/7] x86/vm86: Preserve orig_ax Brian Gerst
2015-07-21  9:39   ` tip-bot for Brian Gerst [this message]
2015-07-20  1:09 ` [PATCH 3/7] x86/vm86: Move userspace accesses to do_sys_vm86() Brian Gerst
2015-07-21  9:39   ` [tip:x86/asm] x86/entry/vm86: " tip-bot for Brian Gerst
2015-07-20  1:09 ` [PATCH 4/7] x86/vm86: Move vm86 fields out of thread_struct Brian Gerst
2015-07-21  6:28   ` Ingo Molnar
2015-07-21  6:30     ` Andy Lutomirski
2015-07-21  6:35       ` Ingo Molnar
2015-07-21  6:31     ` Ingo Molnar
2015-07-21  7:11   ` Ingo Molnar
2015-07-21 15:30     ` Brian Gerst
2015-08-05  8:48       ` Ingo Molnar
2015-08-05  8:53         ` Linus Torvalds
2015-08-23 11:51           ` Ingo Molnar
2015-07-20  1:09 ` [PATCH 5/7] x86/vm86: Move fields from kernel_vm86_struct Brian Gerst
2015-07-20  1:09 ` [PATCH 6/7] x86/vm86: Eliminate kernel_vm86_struct Brian Gerst
2015-07-20  1:09 ` [PATCH 7/7] x86/vm86: Use the normal pt_regs area for vm86 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=tip-df1ae9a5dc66d9fd57109240042372b1065d984a@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=brgerst@gmail.com \
    --cc=dvlasenk@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.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).