| From 7be5ccd31abacc6853983dc8611ef11034508fb0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 8 Sep 2026 14:21:05 -0400 |
| Subject: params: Fix multi-line comment style |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| [ Upstream commit b5e3f86a47d34f7b8af899f8cc70520f6daf8b53 ] |
| |
| The multi-line comment style in the file is rather arbitrary. |
| Make it follow the standard one. |
| |
| Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> |
| Reviewed-by: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Link: https://lore.kernel.org/r/20231120151419.1661807-6-andriy.shevchenko@linux.intel.com |
| Signed-off-by: Kees Cook <keescook@chromium.org> |
| Stable-dep-of: 3dfaae04243c ("params: fix charp corruption on allocation failure") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| kernel/params.c | 20 ++++++++++++-------- |
| 1 file changed, 12 insertions(+), 8 deletions(-) |
| |
| diff --git a/kernel/params.c b/kernel/params.c |
| index dc714a1c67cc4..e1eba5b8230c1 100644 |
| --- a/kernel/params.c |
| +++ b/kernel/params.c |
| @@ -1,8 +1,8 @@ |
| // SPDX-License-Identifier: GPL-2.0-or-later |
| -/* Helpers for initial module or kernel cmdline parsing |
| - Copyright (C) 2001 Rusty Russell. |
| - |
| -*/ |
| +/* |
| + * Helpers for initial module or kernel cmdline parsing |
| + * Copyright (C) 2001 Rusty Russell. |
| + */ |
| #include <linux/ctype.h> |
| #include <linux/device.h> |
| #include <linux/err.h> |
| @@ -275,8 +275,10 @@ int param_set_charp(const char *val, const struct kernel_param *kp) |
| |
| maybe_kfree_parameter(*(char **)kp->arg); |
| |
| - /* This is a hack. We can't kmalloc in early boot, and we |
| - * don't need to; this mangled commandline is preserved. */ |
| + /* |
| + * This is a hack. We can't kmalloc() in early boot, and we |
| + * don't need to; this mangled commandline is preserved. |
| + */ |
| if (slab_is_available()) { |
| *(char **)kp->arg = kmalloc_parameter(len + 1); |
| if (!*(char **)kp->arg) |
| @@ -741,8 +743,10 @@ void module_param_sysfs_remove(struct module *mod) |
| { |
| if (mod->mkobj.mp) { |
| sysfs_remove_group(&mod->mkobj.kobj, &mod->mkobj.mp->grp); |
| - /* We are positive that no one is using any param |
| - * attrs at this point. Deallocate immediately. */ |
| + /* |
| + * We are positive that no one is using any param |
| + * attrs at this point. Deallocate immediately. |
| + */ |
| free_module_param_attrs(&mod->mkobj); |
| } |
| } |
| -- |
| 2.53.0 |
| |