module: don't call percpu_modfree on NULL pointer.
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 25 Sep 2009 06:32:59 +0000 (00:32 -0600)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 24 Sep 2009 15:02:59 +0000 (00:32 +0930)
The general one handles NULL, the static obsolescent
(CONFIG_HAVE_LEGACY_PER_CPU_AREA) one in module.c doesn't; Eric's
commit 720eba31 assumed it did, and various frobbings since then kept
that assumption.

All other callers in module.c all protect it with an if; this effectively
does the same as free_init is only goto if we fail percpu_modalloc().

Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Eric Dumazet <dada1@cosmosbay.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Américo Wang <xiyou.wangcong@gmail.com>
Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
kernel/module.c

index c54f10d90e1c9fc69b47727c948fc36891148510..5a29397ca4b6f1633e91b8b94cfdac14f2071ff9 100644 (file)
@@ -2523,8 +2523,8 @@ static noinline struct module *load_module(void __user *umod,
  free_unload:
        module_unload_free(mod);
 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
- free_init:
        percpu_modfree(mod->refptr);
+ free_init:
 #endif
        module_free(mod, mod->module_init);
  free_core: