From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,wfelipe@google.com,ryan.roberts@arm.com,
rppt@kernel.org,mhiramat@kernel.org,leitao@debian.org,ekffu200098@gmail.com,
brauner@kernel.org,blum@kernel.org,akpm@linux-foundation.org
Subject: + init-use-array_size-in-unknown_bootoption.patch added to mm-nonmm-unstable branch
Date: Wed, 18 Nov 2026 21:23:38 -0800 [thread overview]
Message-ID: <20261119052338.92E8F1F000C4@smtp.kernel.org> (raw)
In-Reply-To: <20261118114034.623145-2-blum@kernel.org>
The patch titled
Subject: init: Use ARRAY_SIZE() in unknown_bootoption()
has been added to the -mm mm-nonmm-unstable branch. Its filename is
init-use-array_size-in-unknown_bootoption.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/init-use-array_size-in-unknown_bootoption.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days
------------------------------------------------------
From: Thorsten Blum <blum@kernel.org>
Subject: init: Use ARRAY_SIZE() in unknown_bootoption()
Date: Wed, 18 Nov 2026 12:40:32 +0100
Remove the NULL terminator from the bootloader array, make its entries
const, and use ARRAY_SIZE() as the loop bound. Make the array itself
static and mark it __initconst, since it is only used during
initialization.
Also reuse the loop index i instead of redeclaring it multiple times.
Link: https://patch.msgid.link/20261118114034.623145-2-blum@kernel.org
Signed-off-by: Thorsten Blum <blum@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Breno Leitao <leitao@debian.org>
Cc: Sang-Heon Jeon <ekffu200098@gmail.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Wilson Felipe Pereira <wfelipe@google.com>
init/main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/init/main.c~init-use-array_size-in-unknown_bootoption
+++ a/init/main.c
@@ -577,7 +577,8 @@ static int __init unknown_bootoption(cha
* 1. LILO/Grub pass "BOOT_IMAGE=...";
* 2. kexec/kdump (kexec-tools) pass "kexec".
*/
- const char *bootloader[] = { "BOOT_IMAGE=", "kexec", NULL };
+ static const char * const bootloader[] __initconst = { "BOOT_IMAGE=", "kexec" };
+ unsigned int i;
/* Handle params aliased to sysctls */
if (sysctl_is_alias(param))
@@ -586,7 +587,7 @@ static int __init unknown_bootoption(cha
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;
}
@@ -604,7 +605,6 @@ static int __init unknown_bootoption(cha
if (val) {
/* Environment option */
- unsigned int i;
for (i = 0; envp_init[i]; i++) {
if (!strncmp(param, envp_init[i], len+1))
break;
@@ -616,7 +616,6 @@ static int __init unknown_bootoption(cha
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";
_
Patches currently in -mm which might be from blum@kernel.org are
init-reject-bare-rodata-parameter-before-architecture-parsing.patch
init-use-strscpy-in-do_initcalls.patch
init-use-kmalloc-in-do_initcalls.patch
init-remove-strlcat-and-sprintf-from-do_one_initcall.patch
init-use-strscpy-in-initcall_blacklist.patch
init-combine-blacklist-entry-allocations-in-initcall_blacklist.patch
parport-use-kstrdup-in-parse_data.patch
init-use-array_size-in-unknown_bootoption.patch
prev parent reply other threads:[~2026-11-19 5:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 11:40 [PATCH v2] init: Use ARRAY_SIZE() in unknown_bootoption() Thorsten Blum
2026-11-19 5:23 ` Andrew Morton [this message]
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=20261119052338.92E8F1F000C4@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=blum@kernel.org \
--cc=brauner@kernel.org \
--cc=ekffu200098@gmail.com \
--cc=leitao@debian.org \
--cc=mhiramat@kernel.org \
--cc=mm-commits@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.