x86 fix
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Jesper Juhl (1):
x86/microcode: Fix double vfree() and remove redundant pointer checks before vfree()
arch/x86/kernel/microcode_intel.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-)
arch/x86/kernel/microcode_intel.c +5 -11
@@ -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 */ if (!mc || mc_size > curr_mc_size) { -if (mc) -vfree (mc); +vfree (mc); mc =vmalloc (mc_size);if (!mc)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) ||microcode_sanity_check (mc) <0 ) { -vfree (mc);break ; }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_mc = mc; 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; } -if (mc) -vfree (mc); +vfree (mc);if (leftover) { -if (new_mc) -vfree (new_mc); +vfree (new_mc); state =UCODE_ERROR ; goto out; }
@@ -405,8 +400,7 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size, goto out; } -if (uci->mc) -vfree (uci->mc); +vfree (uci->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",