From: Thorsten Blum <blum@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
Thorsten Blum <blum@kernel.org>,
Christian Brauner <brauner@kernel.org>,
Sang-Heon Jeon <ekffu200098@gmail.com>,
Breno Leitao <leitao@debian.org>,
Wilson Felipe Pereira <wfelipe@google.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] init: Use ARRAY_SIZE() in unknown_bootoption()
Date: Wed, 18 Nov 2026 01:00:36 +0100 [thread overview]
Message-ID: <20261118000037.552633-2-blum@kernel.org> (raw)
Remove the NULL terminator from the bootloader array, make its entries
const, and use ARRAY_SIZE() as the loop bound. Also reuse the for loop
index i instead of redeclaring it multiple times.
Signed-off-by: Thorsten Blum <blum@kernel.org>
---
init/main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/init/main.c b/init/main.c
index 2011e09439de..5543576c9c29 100644
--- a/init/main.c
+++ b/init/main.c
@@ -576,7 +576,8 @@ static int __init unknown_bootoption(char *param, char *val,
* 1. LILO/Grub pass "BOOT_IMAGE=...";
* 2. kexec/kdump (kexec-tools) pass "kexec".
*/
- const char *bootloader[] = { "BOOT_IMAGE=", "kexec", NULL };
+ const char * const bootloader[] = { "BOOT_IMAGE=", "kexec" };
+ unsigned int i;
/* Handle params aliased to sysctls */
if (sysctl_is_alias(param))
@@ -585,7 +586,7 @@ static int __init unknown_bootoption(char *param, char *val,
repair_env_string(param, val);
/* Handle bootloader identifier */
- for (int i = 0; bootloader[i]; i++) {
+ for (i = 0; i < ARRAY_SIZE(bootloader); i++) {
if (strstarts(param, bootloader[i]))
return 0;
}
@@ -603,7 +604,6 @@ static int __init unknown_bootoption(char *param, char *val,
if (val) {
/* Environment option */
- unsigned int i;
for (i = 0; envp_init[i]; i++) {
if (!strncmp(param, envp_init[i], len+1))
break;
@@ -615,7 +615,6 @@ static int __init unknown_bootoption(char *param, char *val,
envp_init[i] = param;
} else {
/* Command line option */
- unsigned int i;
for (i = 0; argv_init[i]; i++) {
if (i == MAX_INIT_ARGS) {
panic_later = "init";
next reply other threads:[~2026-11-18 0:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 0:00 Thorsten Blum [this message]
2026-11-18 0:40 ` [PATCH] init: Use ARRAY_SIZE() in unknown_bootoption() Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118000037.552633-2-blum@kernel.org \
--to=blum@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=ekffu200098@gmail.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=wfelipe@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox