Commit c3bbf62e authored by Luis Chamberlain's avatar Luis Chamberlain

module: move signature taint to module_augment_kernel_taints()

Just move the signature taint into the helper:

  module_augment_kernel_taints()
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent a12b9451
......@@ -1984,6 +1984,15 @@ static void module_augment_kernel_taints(struct module *mod, struct load_info *i
mod->name);
add_taint_module(mod, TAINT_TEST, LOCKDEP_STILL_OK);
}
#ifdef CONFIG_MODULE_SIG
mod->sig_ok = info->sig_ok;
if (!mod->sig_ok) {
pr_notice_once("%s: module verification failed: signature "
"and/or required key missing - tainting "
"kernel\n", mod->name);
add_taint_module(mod, TAINT_UNSIGNED_MODULE, LOCKDEP_STILL_OK);
}
#endif
}
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
......@@ -2770,15 +2779,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
* We should compromise and converge.
*/
module_augment_kernel_taints(mod, info);
#ifdef CONFIG_MODULE_SIG
mod->sig_ok = info->sig_ok;
if (!mod->sig_ok) {
pr_notice_once("%s: module verification failed: signature "
"and/or required key missing - tainting "
"kernel\n", mod->name);
add_taint_module(mod, TAINT_UNSIGNED_MODULE, LOCKDEP_STILL_OK);
}
#endif
/* To avoid stressing percpu allocator, do this once we're unique. */
err = percpu_modalloc(mod, info);
......
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