leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

Browse Source 
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()
This commit is contained in:
Linus Torvalds 2010-12-28 15:53:54 -08:00
commit 82cd19cd93
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/microcode_intel.c
View File

@ -364,8 +364,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
/* For performance reasons, reuse mc area when possible */ /* For performance reasons, reuse mc area when possible */
if (!mc || mc_size > curr_mc_size) { if (!mc || mc_size > curr_mc_size) {
if (mc) vfree(mc);
vfree(mc);
mc = vmalloc(mc_size); mc = vmalloc(mc_size);
if (!mc) if (!mc)
break; break;
@ -374,13 +373,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
if (get_ucode_data(mc, ucode_ptr, mc_size) || if (get_ucode_data(mc, ucode_ptr, mc_size) ||
microcode_sanity_check(mc) < 0) { microcode_sanity_check(mc) < 0) {
vfree(mc);
break; break;
} }
if (get_matching_microcode(&uci->cpu_sig, mc, new_rev)) { if (get_matching_microcode(&uci->cpu_sig, mc, new_rev)) {
if (new_mc) vfree(new_mc);
vfree(new_mc);
new_rev = mc_header.rev; new_rev = mc_header.rev;
new_mc = mc; new_mc = mc;
mc = NULL; /* trigger new vmalloc */ mc = NULL; /* trigger new vmalloc */
@ -390,12 +387,10 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
leftover -= mc_size; leftover -= mc_size;
} }
if (mc) vfree(mc);
vfree(mc);
if (leftover) { if (leftover) {
if (new_mc) vfree(new_mc);
vfree(new_mc);
state = UCODE_ERROR; state = UCODE_ERROR;
goto out; goto out;
} }
@ -405,8 +400,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
goto out; goto out;
} }
if (uci->mc) vfree(uci->mc);
vfree(uci->mc);
uci->mc = (struct microcode_intel *)new_mc; uci->mc = (struct microcode_intel *)new_mc;
pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n", pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",