Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a95bbfea authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman
Browse files

init/main.c: return 1 from handled __setup() functions 

[ Upstream commit f9a40b0890658330c83c95511f9d6b396610defc ]

initcall_blacklist() should return 1 to indicate that it handled its
cmdline arguments.

set_debug_rodata() should return 1 to indicate that it handled its
cmdline arguments.  Print a warning if the option string is invalid.

This prevents these strings from being added to the 'init' program's
environment as they are not init arguments/parameters.

Link: https://lkml.kernel.org/r/20220221050901.23985-1-rdunlap@infradead.org


Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarIgor Zhbanov <i.zhbanov@omprussia.ru>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b4be80aa

init/main.c

+4 −2
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static int __init initcall_blacklist(char *str) 
		}

	} while (str_entry);



	return 0;

	return 1;

}



static bool __init_or_module initcall_blacklisted(initcall_t fn)
@@ -1072,7 +1072,9 @@ static noinline void __init kernel_init_freeable(void); 
bool rodata_enabled __ro_after_init = true;

static int __init set_debug_rodata(char *str)

{

	return strtobool(str, &rodata_enabled);

	if (strtobool(str, &rodata_enabled))

		pr_warn("Invalid option string for rodata: '%s'\n", str);

	return 1;

}

__setup("rodata=", set_debug_rodata);

#endif