module: clarify the force-loading taint message.
PATCH 1/6 module: clarify the force-loading taint message.
Two of three callers of try_to_force_load() are not because of a missing version, so change the messages:
Old:
<modname>: no version for "magic" found: kernel tainted.
New:
<modname>: bad vermagic: kernel tainted.
Old:
<modname>: no version for "nocrc" found: kernel tainted.
New:
<modname>: no versions for exported symbols: kernel tainted.
Old:
<modname>: no version for "<symname>" found: kernel tainted.
New:
<modname>: <symname>: kernel tainted.
And the last one will be going away in follow-up patches anyway.
Signed-off-by Rusty Russell <[email protected]>
--- kernel/module.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
kernel/module.c +6 -6
@@ -961,12 +961,12 @@ static struct module_attribute *modinfo_static const char vermagic[] =VERMAGIC_STRING ; -static int try_to_force_load (struct module *mod,const char *symname) +static int try_to_force_load (struct module *mod,const char *reason) {#ifdef CONFIG_MODULE_FORCE_LOAD if (!test_taint (TAINT_FORCED_MODULE )) -printk ("%s: no version for \"%s\" found: kernel tainted.\n" , - mod->name, symname); +printk (KERN_WARNING "%s: %s: kernel tainted.\n" , + mod->name, reason);add_taint_module (mod,TAINT_FORCED_MODULE );return 0 ;#else
@@ -1978,7 +1977,7 @@ static noinline struct module *load_modu modmagic =get_modinfo (sechdrs, infoindex,"vermagic" );/* This is allowed: modprobe --force will invalidate it. */ if (!modmagic) { - err =try_to_force_load (mod,"magic" ); + err =try_to_force_load (mod,"bad vermagic" );if (err) goto free_hdr; }else if (!same_magic (modmagic, vermagic, versindex)) {
@@ -2167,8 +2166,8 @@ static noinline struct module *load_modu || (mod->num_unused_gpl_syms && !mod->unused_gpl_crcs) #endif ) { -printk (KERN_WARNING "%s: No versions for exported symbols.\n" , mod->name); - err =try_to_force_load (mod,"nocrc" ); + err =try_to_force_load (mod, +"no versions for exported symbols" );if (err) goto cleanup; }