diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-01 09:50:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-10-01 09:50:58 -0700 |
| commit | ec8c298121e3616f8013d3cf1db9c7169c9b0b2d (patch) | |
| tree | 4720fbe550e8a2e017c56c950429c926ca5bfead /arch/x86/kernel/cpu/common.c | |
| parent | 373ceff28e7883e02ecf18d3e179d09bfcdab663 (diff) | |
| parent | c6c2adcba50c2622ed25ba5d5e7f05f584711358 (diff) | |
| download | linux-ec8c298121e3616f8013d3cf1db9c7169c9b0b2d.tar.gz linux-ec8c298121e3616f8013d3cf1db9c7169c9b0b2d.tar.bz2 linux-ec8c298121e3616f8013d3cf1db9c7169c9b0b2d.zip | |
Merge tag 'x86-urgent-2023-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes: a kerneldoc build warning fix, add SRSO mitigation for
AMD-derived Hygon processors, and fix a SGX kernel crash in the page
fault handler that can trigger when ksgxd races to reclaim the SECS
special page, by making the SECS page unswappable"
* tag 'x86-urgent-2023-10-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sgx: Resolves SECS reclaim vs. page fault for EAUG race
x86/srso: Add SRSO mitigation for Hygon processors
x86/kgdb: Fix a kerneldoc warning when build with W=1
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 382d4e6b848d..4e5ffc8b0e46 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1303,7 +1303,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = { VULNBL_AMD(0x15, RETBLEED), VULNBL_AMD(0x16, RETBLEED), VULNBL_AMD(0x17, RETBLEED | SMT_RSB | SRSO), - VULNBL_HYGON(0x18, RETBLEED | SMT_RSB), + VULNBL_HYGON(0x18, RETBLEED | SMT_RSB | SRSO), VULNBL_AMD(0x19, SRSO), {} }; |