From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 8 Jan 2018 17:33:29 +0000 (-0500)
Subject: x86/spec_ctrl: Add missing IBRS_DISABLE
X-Git-Tag: v4.1.12-124.31.3~1289
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c0c921449cb1f8323a4ea43cba9685bbd601252a;p=users%2Fjedix%2Flinux-maple.git

x86/spec_ctrl: Add missing IBRS_DISABLE

.. which was missing when the system call is done before
the IBRS.

Orabug: 27365403

Reported-by: Alexandre Chartre <alexandre.chartre@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
---

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 507bf55f518c4..b0b13f6ed8327 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -307,6 +307,7 @@ system_call_fastpath:
 	CFI_REGISTER	rip,rcx
 	movq	EFLAGS(%rsp),%r11
 	/*CFI_REGISTER	rflags,r11*/
+	DISABLE_IBRS
 	RESTORE_C_REGS_EXCEPT_RCX_R11
 	/*
 	 * This opens a window where we have a user CR3, but are