lkml.org 
[lkml]   [2022]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 108/277] init/main.c: return 1 from handled __setup() functions
    Date
    From: Randy Dunlap <rdunlap@infradead.org>

    [ 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: Randy Dunlap <rdunlap@infradead.org>
    Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    init/main.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/init/main.c b/init/main.c
    index b340d990d77c..06b98350ebd2 100644
    --- a/init/main.c
    +++ b/init/main.c
    @@ -1198,7 +1198,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)
    @@ -1460,7 +1460,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
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-04-12 09:17    [W:2.152 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site