From 3b5414a4b2d795118aed2eefb7906899db6e205b Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Sun, 8 Jan 2006 01:03:41 -0800 Subject: [PATCH] --- yaml --- r: 16986 b: refs/heads/master c: 9841d61d75da5e46ed7a978bed4f50c78b1d87fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1c81c812da1e..4c64fa3a1c6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f867bac65419a98c9682f4409e087582d29ec5f6 +refs/heads/master: 9841d61d75da5e46ed7a978bed4f50c78b1d87fd diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index 4b06bbad49c2..5d9078d6f0fa 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -1715,6 +1715,11 @@ 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")); + if (strcmp(mod->name, "ndiswrapper") == 0) + add_taint(TAINT_PROPRIETARY_MODULE); + if (strcmp(mod->name, "driverloader") == 0) + add_taint(TAINT_PROPRIETARY_MODULE); + #ifdef CONFIG_MODULE_UNLOAD /* Set up MODINFO_ATTR fields */ setup_modinfo(mod, sechdrs, infoindex);