2013-07-23 20:58:29

by Torsten Kaiser

Subject: [PATCH 1/5] x86, AMD: fix error path in apply_microcode_amd()

Return -1 (like Intels apply_microcode) when the loading fails, also
do not set the active microcode level on failure.

Signed-off-by: Torsten Kaiser <[email protected]>

--- a/arch/x86/kernel/microcode_amd.c 2013-07-23 19:42:16.089517717 +0200
+++ b/arch/x86/kernel/microcode_amd.c 2013-07-23 19:43:30.359517091 +0200
@@ -220,12 +220,13 @@ int apply_microcode_amd(int cpu)
return 0;
}

- if (__apply_microcode_amd(mc_amd))
+ if (__apply_microcode_amd(mc_amd)) {
pr_err("CPU%d: update failed for patch_level=0x%08x\n",
cpu, mc_amd->hdr.patch_id);
- else
- pr_info("CPU%d: new patch_level=0x%08x\n", cpu,
- mc_amd->hdr.patch_id);
+ return -1;
+ }
+ pr_info("CPU%d: new patch_level=0x%08x\n", cpu,
+ mc_amd->hdr.patch_id);

uci->cpu_sig.rev = mc_amd->hdr.patch_id;
c->microcode = mc_amd->hdr.patch_id;

2013-07-24 08:00:13

by Borislav Petkov

Subject: Re: [PATCH 1/5] x86, AMD: fix error path in apply_microcode_amd()

On Tue, Jul 23, 2013 at 10:58:23PM +0200, Torsten Kaiser wrote:
> Return -1 (like Intels apply_microcode) when the loading fails, also
> do not set the active microcode level on failure.
>
> Signed-off-by: Torsten Kaiser <[email protected]>

Acked-by: Borislav Petkov <[email protected]>

@hpa: this is a fix for a76096a6571d5 which went in during this merge
window so queue it for tip-urgent please.

--
Regards/Gruss,
Boris.

Sent from a fat crate under my desk. Formatting is fine.
--

2013-07-31 17:31:14

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/urgent] x86, amd, microcode: Fix error path in apply_microcode_amd()

Commit-ID: d982057f631df04f8d78321084a1a71ca51f3364
Gitweb: http://git.kernel.org/tip/d982057f631df04f8d78321084a1a71ca51f3364
Author: Torsten Kaiser <[email protected]>
AuthorDate: Tue, 23 Jul 2013 22:58:23 +0200
Committer: H. Peter Anvin <[email protected]>
CommitDate: Wed, 31 Jul 2013 08:37:14 -0700

x86, amd, microcode: Fix error path in apply_microcode_amd()

Return -1 (like Intels apply_microcode) when the loading fails, also
do not set the active microcode level on failure.

Signed-off-by: Torsten Kaiser <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Acked-by: Borislav Petkov <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/microcode_amd.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 47ebb1d..7a0adb7 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -220,12 +220,13 @@ int apply_microcode_amd(int cpu)
return 0;
}

- if (__apply_microcode_amd(mc_amd))
+ if (__apply_microcode_amd(mc_amd)) {
pr_err("CPU%d: update failed for patch_level=0x%08x\n",
cpu, mc_amd->hdr.patch_id);
- else
- pr_info("CPU%d: new patch_level=0x%08x\n", cpu,
- mc_amd->hdr.patch_id);
+ return -1;
+ }
+ pr_info("CPU%d: new patch_level=0x%08x\n", cpu,
+ mc_amd->hdr.patch_id);

uci->cpu_sig.rev = mc_amd->hdr.patch_id;
c->microcode = mc_amd->hdr.patch_id;