michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: mitigate swapgs Spectre V1 attacks

Browse source 
See CVE-2019-1125. We mitigate this by adding an 'lfence'
upon interrupt/exception entry after the decision has been
made whether it's necessary to invoke 'swapgs' or not.

Only applies to x86_64, 32-bit doesn't use swapgs.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-01-03 18:13:33 -08:00 • committed by Anas Nashif
commit 4fcf28ef25
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
arch/x86/Kconfig
View file

@ -188,8 +188,9 @@ config X86_NO_SPECTRE_V1
bool bool
help help
This hidden option should be set on a per-SOC basis to indicate that This hidden option should be set on a per-SOC basis to indicate that
a particular SOC is not vulnerable to the Spectre V1, V1.1, and V1.2 a particular SOC is not vulnerable to the Spectre V1, V1.1, V1.2, and
CPU vulnerabilities as described in CVE-2017-5753 and CVE-2018-3693. swapgs CPU vulnerabilities as described in CVE-2017-5753,
CVE-2018-3693, and CVE-2019-1125.
config X86_NO_SPECTRE_V2 config X86_NO_SPECTRE_V2
bool bool

16
arch/x86/core/intel64/locore.S
View file

@ -310,8 +310,12 @@ __resume:
jz 1f jz 1f
swapgs swapgs
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
1:
1: iretq #ifdef CONFIG_X86_BOUNDS_CHECK_BYPASS_MITIGATION
/* swapgs variant of Spectre V1. Disable speculation past this point */
lfence
#endif /* CONFIG_X86_BOUNDS_CHECK_BYPASS_MITIGATION */
iretq
@ -329,6 +333,10 @@ except: /*
jz 1f jz 1f
swapgs swapgs
1: 1:
#ifdef CONFIG_X86_BOUNDS_CHECK_BYPASS_MITIGATION
/* swapgs variant of Spectre V1. Disable speculation past this point */
lfence
#endif /* CONFIG_X86_BOUNDS_CHECK_BYPASS_MITIGATION */
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
pushq %r15 pushq %r15
subq $X86_FXSAVE_SIZE, %rsp subq $X86_FXSAVE_SIZE, %rsp
@ -427,6 +435,10 @@ irq:
jz 1f jz 1f
swapgs swapgs
1: 1:
#ifdef CONFIG_X86_BOUNDS_CHECK_BYPASS_MITIGATION
/* swapgs variant of Spectre V1. Disable speculation past this point */
lfence
#endif /* CONFIG_X86_BOUNDS_CHECK_BYPASS_MITIGATION */
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
pushq %rsi pushq %rsi
movq %gs:__x86_tss64_t_cpu_OFFSET, %rsi movq %gs:__x86_tss64_t_cpu_OFFSET, %rsi