diff --git a/include/linux/module.h b/include/linux/module.h index 3c693fd31ed8..ebfa6af7a173 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -365,7 +365,6 @@ struct module { unsigned int num_gpl_syms; const struct kernel_symbol *gpl_syms; const s32 *gpl_crcs; - bool using_gplonly_symbols; #ifdef CONFIG_UNUSED_SYMBOLS /* unused exported symbols. */ diff --git a/kernel/module.c b/kernel/module.c index 369de5381fe8..60150d2d918e 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1379,25 +1379,6 @@ static inline int same_magic(const char *amagic, const char *bmagic, } #endif /* CONFIG_MODVERSIONS */ -static bool inherit_taint(struct module *mod, struct module *owner) -{ - if (!owner || !test_bit(TAINT_PROPRIETARY_MODULE, &owner->taints)) - return true; - - if (mod->using_gplonly_symbols) { - pr_err("%s: module using GPL-only symbols uses symbols from proprietary module %s.\n", - mod->name, owner->name); - return false; - } - - if (!test_bit(TAINT_PROPRIETARY_MODULE, &mod->taints)) { - pr_warn("%s: module uses symbols from proprietary module %s, inheriting taint.\n", - mod->name, owner->name); - set_bit(TAINT_PROPRIETARY_MODULE, &mod->taints); - } - return true; -} - /* Resolve a symbol for this module. I.e. if we find one, record usage. */ static const struct kernel_symbol *resolve_symbol(struct module *mod, const struct load_info *info, @@ -1422,14 +1403,6 @@ static const struct kernel_symbol *resolve_symbol(struct module *mod, if (!sym) goto unlock; - if (license == GPL_ONLY) - mod->using_gplonly_symbols = true; - - if (!inherit_taint(mod, owner)) { - sym = NULL; - goto getname; - } - if (!check_version(info, name, mod, crc)) { sym = ERR_PTR(-EINVAL); goto getname;