From: Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>
Date: Fri, 1 Aug 2014 14:47:48 +0000 (+0200)
Subject: x86, amd_ucode: fix coverity issues found in cpu_request_microcode()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4566
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6784dd6fdc43914e9bf5b080e12c7877d000dffa;p=xen.git

x86, amd_ucode: fix coverity issues found in cpu_request_microcode()

This patch fixes issues reported by coverity.
 - CID 1229147: dead code
 - CID 1229148: possible resource leak of mc_amd due to goto out statements.

Coverity-IDs: 1229147, 1229148
Reported-by: Andrew Cooper<andrew.cooper3@citrix.com>
Signed-off-by: Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>
Reviewed-by: Andrew Cooper<andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c
index 8f16826a72..1e5503dce7 100644
--- a/xen/arch/x86/microcode_amd.c
+++ b/xen/arch/x86/microcode_amd.c
@@ -379,9 +379,13 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize)
     while ( offset < bufsize )
     {
         error = install_equiv_cpu_table(mc_amd, buf, &offset);
+        if ( error )
+        {
+            printk(KERN_ERR "microcode: installing equivalent cpu table failed\n");
+            break;
+        }
 
-        if ( !error &&
-             find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id,
+        if ( find_equiv_cpu_id(mc_amd->equiv_cpu_table, current_cpu_id,
                                &equiv_cpu_id) )
                 break;
 
@@ -393,7 +397,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize)
         {
             printk(KERN_ERR "microcode: Microcode buffer overrun\n");
             error = -EINVAL;
-            goto out;
+            break;
         }
 
         error = container_fast_forward(buf, bufsize - offset, &offset);
@@ -402,15 +406,13 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize)
             printk(KERN_ERR "microcode: CPU%d incorrect or corrupt container file\n"
                    "microcode: Failed to update patch level. "
                    "Current lvl:%#x\n", cpu, uci->cpu_sig.rev);
-            goto out;
+            break;
         }
     }
 
     if ( error )
     {
         xfree(mc_amd);
-        printk(KERN_ERR "microcode: installing equivalent cpu table failed\n");
-        error = -EINVAL;
         goto out;
     }