Commit ffa9f12a authored by Rusty Russell's avatar Rusty Russell

module: don't call percpu_modfree on NULL pointer.

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: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarRusty 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: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
parent a263f776
...@@ -2523,8 +2523,8 @@ static noinline struct module *load_module(void __user *umod, ...@@ -2523,8 +2523,8 @@ static noinline struct module *load_module(void __user *umod,
free_unload: free_unload:
module_unload_free(mod); module_unload_free(mod);
#if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
free_init:
percpu_modfree(mod->refptr); percpu_modfree(mod->refptr);
free_init:
#endif #endif
module_free(mod, mod->module_init); module_free(mod, mod->module_init);
free_core: free_core:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment