41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From c6dc156a35536e30bb96df8a1b8c93cb16bd219b Mon Sep 17 00:00:00 2001
|
|
From: "Borislav Petkov (AMD)" <bp@alien8.de>
|
|
Date: Mon, 30 Jan 2023 13:48:04 +0100
|
|
Subject: [PATCH 24/36] x86/microcode/core: Return an error only when necessary
|
|
|
|
Return an error from the late loading function which is run on each CPU
|
|
only when an error has actually been encountered during the update.
|
|
|
|
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
|
|
Link: https://lore.kernel.org/r/20230130161709.11615-5-bp@alien8.de
|
|
(cherry picked from commit f33e0c893b22bf94d7985f1f2aa3872237560c74)
|
|
|
|
CVE: CVE-2023-20593
|
|
Signed-off-by: Mridula Shastry <mridula.c.shastry@oracle.com>
|
|
Reviewed-by: Todd Vierling <todd.vierling@oracle.com>
|
|
---
|
|
arch/x86/kernel/cpu/microcode/core.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
|
index 681df41e5b69..23b88e66fa7c 100644
|
|
--- a/arch/x86/kernel/cpu/microcode/core.c
|
|
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
|
@@ -428,10 +428,10 @@ static int __reload_late(void *info)
|
|
goto wait_for_siblings;
|
|
|
|
if (err >= UCODE_NFOUND) {
|
|
- if (err == UCODE_ERROR)
|
|
+ if (err == UCODE_ERROR) {
|
|
pr_warn("Error reloading microcode on CPU %d\n", cpu);
|
|
-
|
|
- ret = -1;
|
|
+ ret = -1;
|
|
+ }
|
|
}
|
|
|
|
wait_for_siblings:
|
|
--
|
|
2.39.3
|
|
|