Skip to content

Commit e2f712d

Browse files
mcgrofgregkh
authored andcommitted
modules: fix modparam async_probe request
commit 4355efbd80482a961cae849281a8ef866e53d55c upstream. Commit f2411da ("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 ecc8617 ("module: add extra argument for parse_params() callback") however commit failed to f2411da 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>
1 parent a24d9a2 commit e2f712d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3515,7 +3515,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
35153515

35163516
/* Module is ready to execute: parsing args may do that. */
35173517
after_dashes = parse_args(mod->name, mod->args, mod->kp, mod->num_kp,
3518-
-32768, 32767, NULL,
3518+
-32768, 32767, mod,
35193519
unknown_module_param_cb);
35203520
if (IS_ERR(after_dashes)) {
35213521
err = PTR_ERR(after_dashes);

0 commit comments

Comments
 (0)