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

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

[Torsten Kaiser]

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 <just.for.lkml@googlemail.com>

--- 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;

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

[Borislav Petkov]

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 <just.for.lkml@googlemail.com>

Acked-by: Borislav Petkov <bp@suse.de>

@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.
--

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

[tip-bot for Torsten Kaiser]

Commit-ID:  d982057f631df04f8d78321084a1a71ca51f3364
Gitweb:     http://git.kernel.org/tip/d982057f631df04f8d78321084a1a71ca51f3364
Author:     Torsten Kaiser <just.for.lkml@googlemail.com>
AuthorDate: Tue, 23 Jul 2013 22:58:23 +0200
Committer:  H. Peter Anvin <hpa@linux.intel.com>
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 <just.for.lkml@googlemail.com>
Link: http://lkml.kernel.org/r/20130723225823.2e4e7588@googlemail.com
Acked-by: Borislav Petkov <bp@suse.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 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;