]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
x86/spec_ctrl: Add missing IBRS_DISABLE
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 8 Jan 2018 17:33:29 +0000 (12:33 -0500)
committerKirtikar Kashyap <kirtikar.kashyap@oracle.com>
Fri, 12 Jan 2018 18:20:13 +0000 (10:20 -0800)
.. 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>
arch/x86/kernel/entry_64.S

index 507bf55f518c4e7e85abf30f3d9292bdcdc68dc0..b0b13f6ed83275804088b2204009e95a60921b3d 100644 (file)
@@ -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