From: Christoph Hellwig <hch@lst.de>
To: Jessica Yu <jeyu@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 7/7] modules: inherit TAINT_PROPRIETARY_MODULE
Date: Wed, 29 Jul 2020 08:27:11 +0200 [thread overview]
Message-ID: <20200729062711.13016-8-hch@lst.de> (raw)
In-Reply-To: <20200729062711.13016-1-hch@lst.de>
If a TAINT_PROPRIETARY_MODULE exports symbol, inherit the tain flag
for all modules importing these symbols, and don't allow loading
symbols from TAINT_PROPRIETARY_MODULE modules if the module previously
imported gplonly symbols. Add a anti-circumvention devices so people
don't accidentally get themselves into trouble this way.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
include/linux/module.h | 1 +
kernel/module.c | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/include/linux/module.h b/include/linux/module.h
index c9bc3412ae4465..d49e033563dadf 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -389,6 +389,7 @@ 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 a907bc57d343f9..eb6ab2f4b81aaa 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1456,6 +1456,18 @@ static const struct kernel_symbol *resolve_symbol(struct module *mod,
if (!sym)
goto unlock;
+ if (licence == GPL_ONLY)
+ mod->using_gplonly_symbols = true;
+
+ if (owner && test_bit(TAINT_PROPRIETARY_MODULE, &owner->taints)) {
+ if (mod->using_gplonly_symbols) {
+ sym = NULL;
+ goto getname;
+ }
+ add_taint_module(mod, TAINT_PROPRIETARY_MODULE,
+ LOCKDEP_NOW_UNRELIABLE);
+ }
+
if (!check_version(info, name, mod, crc)) {
sym = ERR_PTR(-EINVAL);
goto getname;
--
2.27.0
next prev parent reply other threads:[~2020-07-29 6:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 6:27 Christoph Hellwig
2020-07-29 6:27 ` [PATCH 1/7] modules: mark ref_module static Christoph Hellwig
2020-07-29 6:27 ` [PATCH 2/7] modules: mark find_symbol static Christoph Hellwig
2020-07-29 16:13 ` Jessica Yu
2020-07-29 16:24 ` Greg Kroah-Hartman
2020-07-29 17:06 ` Christoph Hellwig
2020-07-29 17:25 ` Joe Lawrence
2020-07-29 6:27 ` [PATCH 3/7] modules: mark each_symbol_section static Christoph Hellwig
2020-07-29 6:27 ` [PATCH 4/7] modules: unexport __module_text_address Christoph Hellwig
2020-07-29 6:27 ` [PATCH 5/7] modules: unexport __module_address Christoph Hellwig
2020-07-29 6:27 ` [PATCH 6/7] modules: return licensing information from find_symbol Christoph Hellwig
2020-07-29 16:48 ` Jessica Yu
2020-07-29 17:06 ` Christoph Hellwig
2020-07-29 6:27 ` Christoph Hellwig [this message]
2020-07-29 6:55 ` [PATCH 7/7] modules: inherit TAINT_PROPRIETARY_MODULE Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200729062711.13016-8-hch@lst.de \
--to=hch@lst.de \
--cc=gregkh@linuxfoundation.org \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®