From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvdP3aCpalogUwrNIfRpuG0HUXef6oklSHbA/3BTpXOWo3lwK4c2vSEiLwDOa1s3QitSQKR ARC-Seal: i=1; a=rsa-sha256; t=1521484319; cv=none; d=google.com; s=arc-20160816; b=fXIvAhtklDZhlOED7OwvrX72gspZH/7jN88VGs/YiAVslAPWt4SUL8wQifkAM5pFVm fxE8BOsrb1JECsWgpdPVvwvFSRWWqo5dCwPDYGjgmrC2CkON8P+WNck6qA8QmPshzZJW upyp+dk5qsqdg5vtdnIT1JyHBa/u70rLAVyLj+W0xXBpYrAkwPSAF0vfPFkhSmNQuz+j 17IV44L4tG5gdOyDXT9knXvOcxO3eg7tXg9bTezKnwPOTcuGyvTt2Ps+3W/7tFqAOm4U yKmmN2CvuuNIyUCfVqKmJoR/2Lb3C9+2cx6QsIobjmOMzDszzp6pvWzpZ6c1Ba6KLCNs jT2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=4XST5G4Oy16Clntzg95oHPRI5vg0jCtTQypi8ARZBNU=; b=lihDcKR+YPq+NKZEdwbO0FouIvMo0TIllASEa7GXrwQ7kpeSZxIhlKv/GVJn212D56 jrHLKgxWkL6tgQIB2jGdEXQ+UchLxKhlc4VZXeOdjwBwCQ3buFOyfHHg+YWPAQ6rz76T QVsZfUabn/fXHEnrbTTbRu+vhP7lIkfmCTIX+zZT7leTXPqOLjoe/7DuzH/+gcbnRjRs 5x8IYIcdtQnxJDcdppTObu3rMPirpRbdxuYuGHI91k2+4zBPnxT+101h7WvgqnNxXdSu skUuTsT9sZXPLEdeI4an0pGEp4aSCFCrGkFLihK/XjQ1ODNj8DYz5s/QD7p1/8KoakfO SskQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stas Sergeev , Bart Oldeman , Andy Lutomirski , Borislav Petkov , Brian Gerst , Denys Vlasenko , "H. Peter Anvin" , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar Subject: [PATCH 4.15 05/52] x86/vm86/32: Fix POPF emulation Date: Mon, 19 Mar 2018 19:08:03 +0100 Message-Id: <20180319180735.348819710@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180734.976730813@linuxfoundation.org> References: <20180319180734.976730813@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1595391058826275806?= X-GMAIL-MSGID: =?utf-8?q?1595391942068640840?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Lutomirski commit b5069782453459f6ec1fdeb495d9901a4545fcb5 upstream. POPF would trap if VIP was set regardless of whether IF was set. Fix it. Suggested-by: Stas Sergeev Reported-by: Bart Oldeman Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: stable@vger.kernel.org Fixes: 5ed92a8ab71f ("x86/vm86: Use the normal pt_regs area for vm86") Link: http://lkml.kernel.org/r/ce95f40556e7b2178b6bc06ee9557827ff94bd28.1521003603.git.luto@kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/vm86_32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c @@ -727,7 +727,8 @@ void handle_vm86_fault(struct kernel_vm8 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; }