summaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2013-07-02 15:35:12 +0930
committerRusty Russell <rusty@rustcorp.com.au>2013-07-02 15:38:21 +0930
commit54041d8a73337411b485ff76957fb106cb5d40d0 (patch)
treed80e16306e28cc2821794be56b37c5e64b091fa5 /kernel/module.c
parent86f120031a21fe4e7333a84f55d9e243c781e6e9 (diff)
downloadlinux-stable-54041d8a73337411b485ff76957fb106cb5d40d0.tar.gz
linux-stable-54041d8a73337411b485ff76957fb106cb5d40d0.tar.bz2
linux-stable-54041d8a73337411b485ff76957fb106cb5d40d0.zip
modules: don't fail to load on unknown parameters.
Although parameters are supposed to be part of the kernel API, experimental parameters are often removed. In addition, downgrading a kernel might cause previously-working modules to fail to load. On balance, it's probably better to warn, and load the module anyway. This may let through a typo, but at least the logs will show it. Reported-by: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c
index a1951aba7a03..5184877ce98a 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3212,6 +3212,17 @@ out:
return err;
}
+static int unknown_module_param_cb(char *param, char *val, const char *modname)
+{
+ /* Check for magic 'dyndbg' arg */
+ int ret = ddebug_dyndbg_module_param_cb(param, val, modname);
+ if (ret != 0) {
+ printk(KERN_WARNING "%s: unknown parameter '%s' ignored\n",
+ modname, param);
+ }
+ return 0;
+}
+
/* Allocate and load the module: note that size of section 0 is always
zero, and we rely on this for optional sections. */
static int load_module(struct load_info *info, const char __user *uargs,
@@ -3298,7 +3309,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
/* Module is ready to execute: parsing args may do that. */
err = parse_args(mod->name, mod->args, mod->kp, mod->num_kp,
- -32768, 32767, &ddebug_dyndbg_module_param_cb);
+ -32768, 32767, unknown_module_param_cb);
if (err < 0)
goto bug_cleanup;