Skip to contentSkip to conversation

module: remove module taint on ndiswrapper

PATCH New Pavel Roskin 1 participant 1 message Feb 3, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 module: remove module taint on ndiswrapper

Revert 0aa5bd52d0c49ca56d24584c646e6544ccbb3dc9, which disallowed ndiswrapper to use GPL-only symbols.

Add comments why ndiswrapper and driverloader are tainted to avoid similar mistakes in the future.

---

 kernel/module.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
kernel/module.c +6 -1
index bd60278..c7f3fa6 100644
@@ -1933,8 +1933,13 @@ static struct module *load_module(void __user *umod,
 	/* Set up license info based on the info section */
 	set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
 
+	/* ndiswrapper can load proprietary drivers.  Don't use
+	   add_taint_module(), as ndiswrapper needs GPL-only symbols. */
 	if (strcmp(mod->name, "ndiswrapper") == 0)
-		add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+		add_taint(TAINT_PROPRIETARY_MODULE);
+
+	/* driverloader is proprietary, but it's known to be lying about
+	   its license in the license info */
 	if (strcmp(mod->name, "driverloader") == 0)
 		add_taint_module(mod, TAINT_PROPRIETARY_MODULE);