Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16986
b: refs/heads/master
c: 9841d61
h: refs/heads/master
v: v3
  • Loading branch information
Dave Jones authored and Linus Torvalds committed Jan 9, 2006
1 parent 5cd5b7d commit 3b5414a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f867bac65419a98c9682f4409e087582d29ec5f6
refs/heads/master: 9841d61d75da5e46ed7a978bed4f50c78b1d87fd
5 changes: 5 additions & 0 deletions trunk/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3b5414a

Please sign in to comment.