From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDED0C433F5 for ; Fri, 1 Apr 2022 15:28:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244029AbiDAP3c (ORCPT ); Fri, 1 Apr 2022 11:29:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349576AbiDAO5m (ORCPT ); Fri, 1 Apr 2022 10:57:42 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E12F1557F8; Fri, 1 Apr 2022 07:44:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 487AFB8240E; Fri, 1 Apr 2022 14:44:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C4BAC2BBE4; Fri, 1 Apr 2022 14:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648824282; bh=PyJAd+7bYNCWsSRK4v2x7FxfIiWWd56XJim2a7gC9L8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J6UHA63jBLxen4MsFScuRLUjOKVvOpq2fbbJo3Hn8b9oRjkxts842eVct7Ogr09i7 ZUuuaL5gJk/zrvgQLC9yLLsQ3QzdncQL2oCO57HsS65EApZO7m0Y2mPnEOB1nmS1nf a4T7HW7XFPaBwl+rBE3UU+LabZWn6zRRkaezYrdWZHqgGaxyWakuo8FObiF0YTEgfl EN9Fg4pum5XFWaRDStuyqjWb7IAd0OgvDtN7Nzb6jPmdpqsFl/DjgjPam+egg72XiR uTIe3T/YSSxbJlMlMu3UaX/5euqEyC4EPNZHNdNcaKGq2NRxKu9g6fhlrleFXiSfWb VE5V431gKaGkA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Randy Dunlap , Igor Zhbanov , Ingo Molnar , Greg Kroah-Hartman , Andrew Morton , Linus Torvalds , Sasha Levin , mhiramat@kernel.org, rostedt@goodmis.org, ahalaney@redhat.com, vbabka@suse.cz, wangkefeng.wang@huawei.com, linux@rasmusvillemoes.dk, keescook@chromium.org, mark-pk.tsai@mediatek.com, valentin.schneider@arm.com, peterz@infradead.org Subject: [PATCH AUTOSEL 5.10 64/65] init/main.c: return 1 from handled __setup() functions Date: Fri, 1 Apr 2022 10:42:05 -0400 Message-Id: <20220401144206.1953700-64-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401144206.1953700-1-sashal@kernel.org> References: <20220401144206.1953700-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ 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 Reported-by: Igor Zhbanov Cc: Ingo Molnar Cc: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- init/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/init/main.c b/init/main.c index 4fe58ed4aca7..3526eaec7508 100644 --- a/init/main.c +++ b/init/main.c @@ -1104,7 +1104,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) @@ -1367,7 +1367,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.34.1