From: Mike Rapoport <rppt@kernel.org>
To: Thorsten Blum <blum@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
Christian Brauner <brauner@kernel.org>,
Breno Leitao <leitao@debian.org>,
Sang-Heon Jeon <ekffu200098@gmail.com>,
Wilson Felipe Pereira <wfelipe@google.com>,
Ryan Roberts <ryan.roberts@arm.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] init: Reject bare rodata parameter before architecture parsing
Date: Sun, 15 Nov 2026 08:47:26 +0200 [thread overview]
Message-ID: <avlVfiKASeue2HsY@kernel.org> (raw)
In-Reply-To: <20261113202321.91770-2-blum@kernel.org>
On Fri, Nov 13, 2026 at 09:23:19PM +0100, Thorsten Blum wrote:
> When a bare rodata parameter is specified on the kernel command line
> without the '=' separator, early parameter parsing passes NULL to
> set_debug_rodata().
>
> Current hooks already handle NULL safely. Reject NULL before calling
> arch_parse_debug_rodata() so architecture hooks always receive a
> non-NULL string.
>
> Return -EINVAL to report the malformed option instead of falling through
> to the existing warning. Also remove the now-redundant NULL checks from
> the "on" and "off" comparisons.
>
> Signed-off-by: Thorsten Blum <blum@kernel.org>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
> ---
> init/main.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index 7b0c8c34e6a9..768b65f2498f 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -1566,12 +1566,15 @@ static inline bool arch_parse_debug_rodata(char *str) { return false; }
>
> static int __init set_debug_rodata(char *str)
> {
> + if (!str)
> + return -EINVAL;
> +
> if (arch_parse_debug_rodata(str))
> return 0;
>
> - if (str && !strcmp(str, "on"))
> + if (!strcmp(str, "on"))
> rodata_enabled = true;
> - else if (str && !strcmp(str, "off"))
> + else if (!strcmp(str, "off"))
> rodata_enabled = false;
> else
> pr_warn("Invalid option string for rodata: '%s'\n", str);
--
Sincerely yours,
Mike.
prev parent reply other threads:[~2026-11-15 6:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-13 20:23 [PATCH] init: Reject bare rodata parameter before architecture parsing Thorsten Blum
2026-11-15 6:47 ` Mike Rapoport [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=avlVfiKASeue2HsY@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=blum@kernel.org \
--cc=brauner@kernel.org \
--cc=ekffu200098@gmail.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox