Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c819a67f authored by Libor Pechacek's avatar Libor Pechacek Committed by Greg Kroah-Hartman
Browse files

module: Issue warnings when tainting kernel 



commit 3205c36cf7d96024626f92d65f560035df1abcb2 upstream.

While most of the locations where a kernel taint bit is set are accompanied
with a warning message, there are two which set their bits silently.  If
the tainting module gets unloaded later on, it is almost impossible to tell
what was the reason for setting the flag.

Signed-off-by: default avatarLibor Pechacek <lpechacek@suse.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e35bc65

kernel/module.c

+10 −1
Original line number Diff line number Diff line
@@ -2888,8 +2888,12 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) 
		return -ENOEXEC;

	}



	if (!get_modinfo(info, "intree"))

	if (!get_modinfo(info, "intree")) {

		if (!test_taint(TAINT_OOT_MODULE))

			pr_warn("%s: loading out-of-tree module taints kernel.\n",

				mod->name);

		add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);

	}



	if (get_modinfo(info, "staging")) {

		add_taint_module(mod, TAINT_CRAP, LOCKDEP_STILL_OK);
@@ -3054,6 +3058,8 @@ static int move_module(struct module *mod, struct load_info *info) 


static int check_module_license_and_versions(struct module *mod)

{

	int prev_taint = test_taint(TAINT_PROPRIETARY_MODULE);



	/*

	 * ndiswrapper is under GPL by itself, but loads proprietary modules.

	 * Don't use add_taint_module(), as it would prevent ndiswrapper from
@@ -3072,6 +3078,9 @@ static int check_module_license_and_versions(struct module *mod) 
		add_taint_module(mod, TAINT_PROPRIETARY_MODULE,

				 LOCKDEP_NOW_UNRELIABLE);



	if (!prev_taint && test_taint(TAINT_PROPRIETARY_MODULE))

		pr_warn("%s: module license taints kernel.\n", mod->name);



#ifdef CONFIG_MODVERSIONS

	if ((mod->num_syms && !mod->crcs)

	    || (mod->num_gpl_syms && !mod->gpl_crcs)