Merge git://github.com/rustyrussell/linux

* git://github.com/rustyrussell/linux:
  module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
  module: Enable dynamic debugging regardless of taint

2 files changed, 9 insertions, 4 deletions

diff --git a/kernel/module.c b/kernel/module.c
index 93342d992f34..ef8cb70c6996 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2487,6 +2487,9 @@ static int check_modinfo(struct module *mod, struct load_info *info)
                 return -ENOEXEC;
         }
 
+        if (!get_modinfo(info, "intree"))
+                add_taint_module(mod, TAINT_OOT_MODULE);
+
         if (get_modinfo(info, "staging")) {
                 add_taint_module(mod, TAINT_CRAP);
                 printk(KERN_WARNING "%s: module is from the staging directory,"
@@ -2878,8 +2881,7 @@ static struct module *load_module(void __user *umod,
         }
 
         /* This has to be done once we're sure module name is unique. */
-        if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
-                dynamic_debug_setup(info.debug, info.num_debug);
+        dynamic_debug_setup(info.debug, info.num_debug);
 
         /* Find duplicate symbols */
         err = verify_export_symbols(mod);
@@ -2915,8 +2917,7 @@ static struct module *load_module(void __user *umod,
         module_bug_cleanup(mod);
 
  ddebug:
-        if (!mod->taints || mod->taints == (1U<<TAINT_CRAP))
-                dynamic_debug_remove(info.debug);
+        dynamic_debug_remove(info.debug);
  unlock:
         mutex_unlock(&module_mutex);
         synchronize_sched();
@@ -3257,6 +3258,8 @@ static char *module_flags(struct module *mod, char *buf)
                 buf[bx++] = '(';
                 if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))
                         buf[bx++] = 'P';
+                else if (mod->taints & (1 << TAINT_OOT_MODULE))
+                        buf[bx++] = 'O';
                 if (mod->taints & (1 << TAINT_FORCED_MODULE))
                         buf[bx++] = 'F';
                 if (mod->taints & (1 << TAINT_CRAP))
diff --git a/kernel/panic.c b/kernel/panic.c
index d7bb6974efb5..b26593604214 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -177,6 +177,7 @@ static const struct tnt tnts[] = {
         { TAINT_WARN,                   'W', ' ' },
         { TAINT_CRAP,                   'C', ' ' },
         { TAINT_FIRMWARE_WORKAROUND,    'I', ' ' },
+        { TAINT_OOT_MODULE,             'O', ' ' },
 };
 
 /**
@@ -194,6 +195,7 @@ static const struct tnt tnts[] = {
  *  'W' - Taint on warning.
  *  'C' - modules from drivers/staging are loaded.
  *  'I' - Working around severe firmware bug.
+ *  'O' - Out-of-tree module has been loaded.
  *
  *      The string is overwritten by the next call to print_tainted().
  */