From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932083AbbGUJjy (ORCPT ); Tue, 21 Jul 2015 05:39:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40426 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754149AbbGUJjw (ORCPT ); Tue, 21 Jul 2015 05:39:52 -0400 Date: Tue, 21 Jul 2015 02:39:17 -0700 From: tip-bot for Brian Gerst Message-ID: 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 Reply-To: peterz@infradead.org, hpa@zytor.com, luto@amacapital.net, torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, brgerst@gmail.com, dvlasenk@redhat.com In-Reply-To: <1437354550-25858-3-git-send-email-brgerst@gmail.com> References: <1437354550-25858-3-git-send-email-brgerst@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry/vm86: Preserve 'orig_ax' Git-Commit-ID: df1ae9a5dc66d9fd57109240042372b1065d984a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: df1ae9a5dc66d9fd57109240042372b1065d984a Gitweb: http://git.kernel.org/tip/df1ae9a5dc66d9fd57109240042372b1065d984a Author: Brian Gerst AuthorDate: Sun, 19 Jul 2015 21:09:05 -0400 Committer: Ingo Molnar 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 Cc: Andy Lutomirski Cc: Denys Vlasenko Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1437354550-25858-3-git-send-email-brgerst@gmail.com Signed-off-by: Ingo Molnar --- 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;