From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH 1/2] x86, amd_ucode: Fix coverity issues found in cpu_request_microcode() Date: Wed, 30 Jul 2014 17:25:11 +0100 Message-ID: <53D91C67.8060502@citrix.com> References: <1406736775-13247-1-git-send-email-aravind.gopalakrishnan@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1406736775-13247-1-git-send-email-aravind.gopalakrishnan@amd.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Aravind Gopalakrishnan , jbeulich@suse.com, keir@xen.org Cc: coverity@xenproject.org, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 30/07/14 17:12, Aravind Gopalakrishnan wrote: > This patch fixes issues found in CID 1229147(dead code) and > CID 1229148: possible resource leak of mc_amd due to goto out > statements. > > Reported-by: Andrew Cooper > Signed-off-by: Aravind Gopalakrishnan Coverity-IDs: 1229147, 1229148 We tend to annotate IDs like this in commits. With your noticed adjustment, Reviewed-by: Andrew Cooper > --- > xen/arch/x86/microcode_amd.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c > index 14728a2..a2bdd20 100644 > --- a/xen/arch/x86/microcode_amd.c > +++ b/xen/arch/x86/microcode_amd.c > @@ -384,9 +384,12 @@ 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; > > @@ -398,7 +401,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); > @@ -407,15 +410,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; > } >