From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvbDtUAH1+sJMfRYRrJOjj10Aj/Oi+xQvz0bE/SEi4WW/8Q8fEvrYoRlT6NZ2Nlu0Tdoucl ARC-Seal: i=1; a=rsa-sha256; t=1521484128; cv=none; d=google.com; s=arc-20160816; b=Zi2S9imo6qLOV+cjkRb9bckfxntJ7q8Z6PWlVw5h4lemC6fr/nODoH3f+NX0BHomXB 7ocOP54c9dVLphcOq9kG4BJ7nExZqSKgfgnZ2QVhKKbH0+2AvHv230Do7KFjpRZH1pYa /F60piKhbcwTZ/LC/oLanrlGzRX1zU+I6BojaixGn1KUhk4/uWvRUXi46qu9Va4L5ZfK xDpUbbwZ7tG05hLgX6cvUVnDPRUWol2lg/cifIOqi/VjE7EkN1WhAil0I2hoFBc5QNAK c4GH3uDB5vhQe9DqF+3mO3ZR8nhD/Hq2zgLzD3zOnSgIChbq9PAlUkxlCcpOQO0oCOjk QW4g== 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=A4WK57pxvJvYVzgsTNVJlhN/6rdRrYWAJnFTqU2Vbwk=; b=xLEuuto+tI0lE7LjjiEnU2iiaAOfLvoTttAeJlUVD4krR7dj5LZEutFI7Van86gxSb ZYyqcFAltob1aNKn+9dJalh13afBQx9oNVhmaOGwhEBtshaAA6PzyDbuJqHES+sdm2Hc At0KAmk/OZKBIGKgv7TJxF8pwCSwS7a7C+Xpuh+P8MOZzko6La+MT5hQ+Vu7fZcCQAqk H52qC30tyfS6K6hXaebLl/WAWn5yi0a5QcEMUoVDAZTcnTnh+T+wD51ADM1kJ5pZej8s 4KZJNg9BUEVUpcl693xIGQV8LSMcgEzJgRzSkottgdOyR1xO5rU6lUPAygMLmtcBhsZg 53iw== 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.9 217/241] x86/vm86/32: Fix POPF emulation Date: Mon, 19 Mar 2018 19:08:02 +0100 Message-Id: <20180319180800.159625579@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@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?1595391741971305083?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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 @@ -719,7 +719,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; }