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

module: Increase readability of module_kallsyms_lookup_name()

Browse Source 
module_kallsyms_lookup_name() has several exit conditions but
can't return immediately due to preempt_disable().

Refactor module_kallsyms_lookup_name() to allow returning from
anywhere, and reduce depth.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
Christophe Leroy 2022-06-13 08:02:02 +02:00 committed by Luis Chamberlain
parent ecc726f145
commit 07ade45a76
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/module/kallsyms.c
View File

@ -457,29 +457,39 @@ unsigned long find_kallsyms_symbol_value(struct module *mod, const char *name)
return 0; return 0;
} }
/* Look for this name: can be of form module:name. */ static unsigned long __module_kallsyms_lookup_name(const char *name)
unsigned long module_kallsyms_lookup_name(const char *name)
{ {
struct module *mod; struct module *mod;
char *colon; char *colon;
unsigned long ret = 0;
/* Don't lock: we're in enough trouble already. */
preempt_disable();
colon = strnchr(name, MODULE_NAME_LEN, ':'); colon = strnchr(name, MODULE_NAME_LEN, ':');
if (colon) { if (colon) {
mod = find_module_all(name, colon - name, false); mod = find_module_all(name, colon - name, false);
if (mod) if (mod)
ret = find_kallsyms_symbol_value(mod, colon + 1); return find_kallsyms_symbol_value(mod, colon + 1);
} else { return 0;
}
list_for_each_entry_rcu(mod, &modules, list) { list_for_each_entry_rcu(mod, &modules, list) {
unsigned long ret;
if (mod->state == MODULE_STATE_UNFORMED) if (mod->state == MODULE_STATE_UNFORMED)
continue; continue;
ret = find_kallsyms_symbol_value(mod, name); ret = find_kallsyms_symbol_value(mod, name);
if (ret) if (ret)
break; return ret;
} }
return 0;
} }
/* Look for this name: can be of form module:name. */
unsigned long module_kallsyms_lookup_name(const char *name)
{
unsigned long ret;
/* Don't lock: we're in enough trouble already. */
preempt_disable();
ret = __module_kallsyms_lookup_name(name);
preempt_enable(); preempt_enable();
return ret; return ret;
} }