From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965851AbcBEAQN (ORCPT ); Thu, 4 Feb 2016 19:16:13 -0500 Received: from ozlabs.org ([103.22.144.67]:43075 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbcBEAOg (ORCPT ); Thu, 4 Feb 2016 19:14:36 -0500 From: Rusty Russell To: linux-kernel@vger.kernel.org Cc: "Luis R. Rodriguez" , Weilong Chen , Masami Hiramatsu , "PDate:Wed"@ozlabs.org, 3@ozlabs.org, Feb@ozlabs.org, 2016@ozlabs.org, "16:55:26"@ozlabs.org, +1030@ozlabs.org, Hannes Reinecke , Dmitry Torokhov , stable@vger.kernel.org (4.2+), Rusty Russell Subject: [PATCH 1/3] modules: fix modparam async_probe request Date: Fri, 5 Feb 2016 10:44:11 +1030 Message-Id: <1454631253-14379-2-git-send-email-rusty@rustcorp.com.au> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454631253-14379-1-git-send-email-rusty@rustcorp.com.au> References: <1454631253-14379-1-git-send-email-rusty@rustcorp.com.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Luis R. Rodriguez" 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 Cc: Dmitry Torokhov Cc: stable@vger.kernel.org (4.2+) Signed-off-by: Luis R. Rodriguez Signed-off-by: Rusty Russell [minimized] Signed-off-by: Rusty Russell --- kernel/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/module.c b/kernel/module.c index 8358f4697c0c..2149f7003e49 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -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); -- 2.5.0