]> Git Repo - linux.git/commit
x86/entry: Use the correct fence macro after swapgs in kernel CR3
authorLai Jiangshan <[email protected]>
Fri, 26 Nov 2021 10:11:22 +0000 (18:11 +0800)
committerBorislav Petkov <[email protected]>
Fri, 3 Dec 2021 18:13:53 +0000 (19:13 +0100)
commit1367afaa2ee90d1c956dfc224e199fcb3ff3f8cc
tree19d948b14420f3ff5327c15adfea84543e7bd4d2
parentc07e45553da1808aa802e9f0ffa8108cfeaf7a17
x86/entry: Use the correct fence macro after swapgs in kernel CR3

The commit

  c75890700455 ("x86/entry/64: Remove unneeded kernel CR3 switching")

removed a CR3 write in the faulting path of load_gs_index().

But the path's FENCE_SWAPGS_USER_ENTRY has no fence operation if PTI is
enabled, see spectre_v1_select_mitigation().

Rather, it depended on the serializing CR3 write of SWITCH_TO_KERNEL_CR3
and since it got removed, add a FENCE_SWAPGS_KERNEL_ENTRY call to make
sure speculation is blocked.

 [ bp: Massage commit message and comment. ]

Fixes: c75890700455 ("x86/entry/64: Remove unneeded kernel CR3 switching")
Signed-off-by: Lai Jiangshan <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
arch/x86/entry/entry_64.S
This page took 0.054274 seconds and 4 git commands to generate.