module: Enhance verify_export_symbols
Make verify_export_symbols check the modules unused, unused_gpl and gpl_future syms. Inspired by Jan Beulich's fix, but table-driven. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
parent
4e2d92454b
commit
b211104d11
1 changed files with 24 additions and 24 deletions
|
@ -1400,33 +1400,33 @@ EXPORT_SYMBOL_GPL(__symbol_get);
|
||||||
*/
|
*/
|
||||||
static int verify_export_symbols(struct module *mod)
|
static int verify_export_symbols(struct module *mod)
|
||||||
{
|
{
|
||||||
const char *name = NULL;
|
unsigned int i;
|
||||||
unsigned long i, ret = 0;
|
|
||||||
struct module *owner;
|
struct module *owner;
|
||||||
const unsigned long *crc;
|
const struct kernel_symbol *s;
|
||||||
|
struct {
|
||||||
|
const struct kernel_symbol *sym;
|
||||||
|
unsigned int num;
|
||||||
|
} arr[] = {
|
||||||
|
{ mod->syms, mod->num_syms },
|
||||||
|
{ mod->gpl_syms, mod->num_gpl_syms },
|
||||||
|
{ mod->gpl_future_syms, mod->num_gpl_future_syms },
|
||||||
|
{ mod->unused_syms, mod->num_unused_syms },
|
||||||
|
{ mod->unused_gpl_syms, mod->num_unused_gpl_syms },
|
||||||
|
};
|
||||||
|
|
||||||
for (i = 0; i < mod->num_syms; i++)
|
for (i = 0; i < ARRAY_SIZE(arr); i++) {
|
||||||
if (!IS_ERR_VALUE(find_symbol(mod->syms[i].name,
|
for (s = arr[i].sym; s < arr[i].sym + arr[i].num; s++) {
|
||||||
&owner, &crc, true, false))) {
|
if (!IS_ERR_VALUE(find_symbol(s->name, &owner,
|
||||||
name = mod->syms[i].name;
|
NULL, true, false))) {
|
||||||
ret = -ENOEXEC;
|
printk(KERN_ERR
|
||||||
goto dup;
|
"%s: exports duplicate symbol %s"
|
||||||
|
" (owned by %s)\n",
|
||||||
|
mod->name, s->name, module_name(owner));
|
||||||
|
return -ENOEXEC;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
for (i = 0; i < mod->num_gpl_syms; i++)
|
return 0;
|
||||||
if (!IS_ERR_VALUE(find_symbol(mod->gpl_syms[i].name,
|
|
||||||
&owner, &crc, true, false))) {
|
|
||||||
name = mod->gpl_syms[i].name;
|
|
||||||
ret = -ENOEXEC;
|
|
||||||
goto dup;
|
|
||||||
}
|
|
||||||
|
|
||||||
dup:
|
|
||||||
if (ret)
|
|
||||||
printk(KERN_ERR "%s: exports duplicate symbol %s (owned by %s)\n",
|
|
||||||
mod->name, name, module_name(owner));
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Change all symbols so that st_value encodes the pointer directly. */
|
/* Change all symbols so that st_value encodes the pointer directly. */
|
||||||
|
|
Loading…
Reference in a new issue