+ init-reject-bare-rodata-parameter-before-architecture-parsing.patch added to mm-nonmm-unstable branch

+ init-reject-bare-rodata-parameter-before-architecture-parsing.patch added to mm-nonmm-unstable branch

[Andrew Morton]

The patch titled
     Subject: init: reject bare rodata parameter before architecture parsing
has been added to the -mm mm-nonmm-unstable branch.  Its filename is
     init-reject-bare-rodata-parameter-before-architecture-parsing.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/init-reject-bare-rodata-parameter-before-architecture-parsing.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: reject bare rodata parameter before architecture parsing
Date: Fri, 13 Nov 2026 21:23:19 +0100

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.

Link: https://lore.kernel.org/20261113202321.91770-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: Christian Brauner <brauner@kernel.org>
Cc: Breno Leitao <leitao@debian.org>
Cc: Sang-Heon Jeon <ekffu200098@gmail.com>
Cc: Wilson Felipe Pereira <wfelipe@google.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
---

 init/main.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- a/init/main.c~init-reject-bare-rodata-parameter-before-architecture-parsing
+++ a/init/main.c
@@ -1566,12 +1566,15 @@ static inline bool arch_parse_debug_roda
 
 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);
_

Patches currently in -mm which might be from blum@kernel.org are

init-reject-bare-rodata-parameter-before-architecture-parsing.patch