[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1457391064-6660-71-git-send-email-kamal@canonical.com>
Date: Mon, 7 Mar 2016 14:47:41 -0800
From: Kamal Mostafa <kamal@...onical.com>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
kernel-team@...ts.ubuntu.com
Cc: Hannes Reinecke <hare@...e.de>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
"Luis R . Rodriguez" <mcgrof@...e.com>,
"Rusty Russell [minimized]" <rusty@...tcorp.com.au>,
Kamal Mostafa <kamal@...onical.com>
Subject: [PATCH 4.2.y-ckt 070/273] modules: fix modparam async_probe request
4.2.8-ckt5 -stable review patch. If anyone has any objections, please let me know.
---8<------------------------------------------------------------
From: "Luis R. Rodriguez" <mcgrof@...e.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@...e.de>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@...e.com>
Signed-off-by: Rusty Russell <rusty@...tcorp.com.au> [minimized]
Signed-off-by: Kamal Mostafa <kamal@...onical.com>
---
kernel/module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/module.c b/kernel/module.c
index 38c7bd5..ac8f2fb 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3515,7 +3515,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);
--
2.7.0
Powered by blists - more mailing lists