Commit 4355efbd authored Feb 03, 2016 by Luis R. Rodriguez Committed by Rusty Russell Feb 03, 2016

modules: fix modparam async_probe request



Commit f2411da7 ("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 ecc86170 ("module: add extra
argument for parse_params() callback") however commit
failed to f2411da7 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>
Cc: stable@vger.kernel.org (4.2+)
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> [minimized]

parent 34229b27

kernel/module.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3496,7 +3496,7 @@ static int load_module(struct load_info info, const char __user uargs,

		/* 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);