| From 4355efbd80482a961cae849281a8ef866e53d55c Mon Sep 17 00:00:00 2001 |
| From: "Luis R. Rodriguez" <mcgrof@suse.com> |
| Date: Wed, 3 Feb 2016 16:55:26 +1030 |
| Subject: modules: fix modparam async_probe request |
| |
| From: Luis R. Rodriguez <mcgrof@suse.com> |
| |
| commit 4355efbd80482a961cae849281a8ef866e53d55c upstream. |
| |
| Commit f2411da746985 ("driver-core: add driver module |
| asynchronous probe support") added async probe support, |
| in two forms: |
| |
| * in-kernel driver specification annotation |
| * generic async_probe module parameter (modprobe foo async_probe) |
| |
| To support the generic kernel parameter parse_args() was |
| extended via commit ecc8617053e0 ("module: add extra |
| argument for parse_params() callback") however commit |
| failed to f2411da746985 failed to add the required argument. |
| |
| This causes a crash then whenever async_probe generic |
| module parameter is used. This was overlooked when the |
| form in which in-kernel async probe support was reworked |
| a bit... Fix this as originally intended. |
| |
| Cc: Hannes Reinecke <hare@suse.de> |
| Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com> |
| Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> [minimized] |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| kernel/module.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/kernel/module.c |
| +++ b/kernel/module.c |
| @@ -3515,7 +3515,7 @@ static int load_module(struct load_info |
| |
| /* Module is ready to execute: parsing args may do that. */ |
| after_dashes = parse_args(mod->name, mod->args, mod->kp, mod->num_kp, |
| - -32768, 32767, NULL, |
| + -32768, 32767, mod, |
| unknown_module_param_cb); |
| if (IS_ERR(after_dashes)) { |
| err = PTR_ERR(after_dashes); |
