modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules

commit 9011e49d54dcc7653ebb8a1e05b5badb5ecfa9f9 upstream.

It has recently come to my attention that nvidia is circumventing the
protection added in 262e6ae7081d ("modules: inherit
TAINT_PROPRIETARY_MODULE") by importing exports from their proprietary
modules into an allegedly GPL licensed module and then rexporting them.

Given that symbol_get was only ever intended for tightly cooperating
modules using very internal symbols it is logical to restrict it to
being used on EXPORT_SYMBOL_GPL and prevent nvidia from costly DMCA
Circumvention of Access Controls law suites.

All symbols except for four used through symbol_get were already exported
as EXPORT_SYMBOL_GPL, and the remaining four ones were switched over in
the preparation patches.

Fixes: 262e6ae7081d ("modules: inherit TAINT_PROPRIETARY_MODULE")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/kernel/module.c b/kernel/module.c
index ed96295cc11426657972bb75cc6014fc6ad8b377..3c90840133c0e24568d8067adba38d3d4c883506 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2220,12 +2220,20 @@ void *__symbol_get(const char *symbol)
        };
 
        preempt_disable();
-       if (!find_symbol(&fsa) || strong_try_module_get(fsa.owner)) {
-               preempt_enable();
-               return NULL;
+       if (!find_symbol(&fsa))
+               goto fail;
+       if (fsa.license != GPL_ONLY) {
+               pr_warn("failing symbol_get of non-GPLONLY symbol %s.\n",
+                       symbol);
+               goto fail;
        }
+       if (strong_try_module_get(fsa.owner))
+               goto fail;
        preempt_enable();
        return (void *)kernel_symbol_value(fsa.sym);
+fail:
+       preempt_enable();
+       return NULL;
 }
 EXPORT_SYMBOL_GPL(__symbol_get);