Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-09-22 04:32:41 +00:00
Code Issues 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

6
arch/x86/kernel/microcode_intel.c
View file

@ -364,7 +364,6 @@ 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)
@ -374,12 +373,10 @@ 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;
@ -390,11 +387,9 @@ 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,7 +400,6 @@ 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;