From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A42593A8730; Sat, 30 May 2026 17:07:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160861; cv=none; b=D0KJ8mB1SBMqYDd1ZOUqH76R3vV8nC5YNOpaseSLJBYQoTQsWWCbThzSWReshaawJXsiPF2Tpq9xDbh+h6DRtS6aWtUPosV7YQeBPKt8KfES+UBxb/MOVs8GHsn2axOgt6k+RnOcGgvR7eHiCmlB1dRD7GJxNq7gy5nXYM1Jbo4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160861; c=relaxed/simple; bh=sSdei+ls5Y4BInrG5i0XodigETDg5DeL12bqGHMzKh0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Af0cR6wtPtW62ODG30AJ0bJ4AqcINawrXWdyk9Xgh9itXPaO1gLQLqyj8XbNTDVJ1vL84FsFbwIByRvLQtetha5x3DlwNdFIKeFfaGEu6OtD7YKzkTRJLNlXI61t0BWgn6DtR0LybN/e9FiQ0twk2VMN1DRv7FW7+rEecDyjd08= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=g3aq1HPo; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="g3aq1HPo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2CBF1F00893; Sat, 30 May 2026 17:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160859; bh=YZUiZUrdNUV9L5Oc/WFBL1mEn4JP8nhOHDbV1AOPKbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=g3aq1HPoJRfh/P0051cFEHISUfsCAy5U4zdjg3mhzoP0g63mfppagyP+nhyMLEpGt esoEZ7wCcK6KHHhVVgaIHfHZLiui5Enp59NMll10LlnLRHk5ZRK5Wk3fMn2XnIV6bX VCSXKURD+vrDpBBMqEoIcKuICPBjWAR0p/mhtqjI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Petr Pavlu , Sami Tolvanen , Sasha Levin Subject: [PATCH 6.1 455/969] module: Fix freeing of charp module parameters when CONFIG_SYSFS=n Date: Sat, 30 May 2026 17:59:39 +0200 Message-ID: <20260530160312.844684887@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Petr Pavlu [ Upstream commit deffe1edba626d474fef38007c03646ca5876a0e ] When setting a charp module parameter, the param_set_charp() function allocates memory to store a copy of the input value. Later, when the module is potentially unloaded, the destroy_params() function is called to free this allocated memory. However, destroy_params() is available only when CONFIG_SYSFS=y, otherwise only a dummy variant is present. In the unlikely case that the kernel is configured with CONFIG_MODULES=y and CONFIG_SYSFS=n, this results in a memory leak of charp values when a module is unloaded. Fix this issue by making destroy_params() always available when CONFIG_MODULES=y. Rename the function to module_destroy_params() to clarify that it is intended for use by the module loader. Fixes: e180a6b7759a ("param: fix charp parameters set via sysfs") Signed-off-by: Petr Pavlu Signed-off-by: Sami Tolvanen Signed-off-by: Sasha Levin --- include/linux/moduleparam.h | 11 +++-------- kernel/module/main.c | 4 ++-- kernel/params.c | 27 ++++++++++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 061e19c94a6bc..f73ca4d62683b 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -392,14 +392,9 @@ extern char *parse_args(const char *name, const char *doing, void *arg)); /* Called by module remove. */ -#ifdef CONFIG_SYSFS -extern void destroy_params(const struct kernel_param *params, unsigned num); -#else -static inline void destroy_params(const struct kernel_param *params, - unsigned num) -{ -} -#endif /* !CONFIG_SYSFS */ +#ifdef CONFIG_MODULES +void module_destroy_params(const struct kernel_param *params, unsigned int num); +#endif /* All the helper functions */ /* The macros to do compile-time type checking stolen from Jakub diff --git a/kernel/module/main.c b/kernel/module/main.c index 6b3cffd9f8a8a..e83e84f699ded 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1172,7 +1172,7 @@ static void free_module(struct module *mod) module_unload_free(mod); /* Free any allocated parameters. */ - destroy_params(mod->kp, mod->num_kp); + module_destroy_params(mod->kp, mod->num_kp); if (is_livepatch_module(mod)) free_module_elf(mod); @@ -2890,7 +2890,7 @@ static int load_module(struct load_info *info, const char __user *uargs, mod_sysfs_teardown(mod); coming_cleanup: mod->state = MODULE_STATE_GOING; - destroy_params(mod->kp, mod->num_kp); + module_destroy_params(mod->kp, mod->num_kp); blocking_notifier_call_chain(&module_notify_list, MODULE_STATE_GOING, mod); klp_module_going(mod); diff --git a/kernel/params.c b/kernel/params.c index 5ae507cd19960..82109c0cf9918 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -743,15 +743,6 @@ void module_param_sysfs_remove(struct module *mod) } #endif -void destroy_params(const struct kernel_param *params, unsigned num) -{ - unsigned int i; - - for (i = 0; i < num; i++) - if (params[i].ops->free) - params[i].ops->free(params[i].arg); -} - struct module_kobject * __init_or_module lookup_or_create_module_kobject(const char *name) { @@ -971,3 +962,21 @@ static int __init param_sysfs_init(void) subsys_initcall(param_sysfs_init); #endif /* CONFIG_SYSFS */ + +#ifdef CONFIG_MODULES + +/* + * module_destroy_params - free all parameters for one module + * @params: module parameters (array) + * @num: number of module parameters + */ +void module_destroy_params(const struct kernel_param *params, unsigned int num) +{ + unsigned int i; + + for (i = 0; i < num; i++) + if (params[i].ops->free) + params[i].ops->free(params[i].arg); +} + +#endif /* CONFIG_MODULES */ -- 2.53.0