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 X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 901FBC433E1 for ; Tue, 4 Aug 2020 20:59:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 79D6D2086A for ; Tue, 4 Aug 2020 20:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728730AbgHDU7f (ORCPT ); Tue, 4 Aug 2020 16:59:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:43860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727124AbgHDU7c (ORCPT ); Tue, 4 Aug 2020 16:59:32 -0400 Received: from oasis.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6CEDC2086A; Tue, 4 Aug 2020 20:59:31 +0000 (UTC) Date: Tue, 4 Aug 2020 16:59:29 -0400 From: Steven Rostedt To: Masami Hiramatsu Cc: Arvind Sankar , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] bootconfig: Fix to find the initargs correctly Message-ID: <20200804165929.3bfeb318@oasis.local.home> In-Reply-To: <159650953285.270383.14822353843556363851.stgit@devnote2> References: <159650953285.270383.14822353843556363851.stgit@devnote2> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 4 Aug 2020 11:52:13 +0900 Masami Hiramatsu wrote: > Since the parse_args() stops parsing at '--', bootconfig_params() > will never get the '--' as param and initargs_found never be true. > In the result, if we pass some init arguments via the bootconfig, > those are always appended to the kernel command line with '--' > even if the kernel command line already has '--'. > > To fix this correctly, check the return value of parse_args() > and set initargs_found true if the return value is not an error > but a valid address. Thanks Masami, I'll start testing this now. I just finished testing everything else I had in my queue and pushed it to my for-next branch. Can you check to see if I missed anything there? -- Steve > > Fixes: f61872bb58a1 ("bootconfig: Use parse_args() to find bootconfig and '--'") > Cc: stable@vger.kernel.org > Reported-by: Arvind Sankar > Suggested-by: Arvind Sankar > Signed-off-by: Masami Hiramatsu > --- > Changes in v2: > - Remvoe unneede !IS_ERR(). > --- > init/main.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/init/main.c b/init/main.c > index 0ead83e86b5a..883ded3638e5 100644 > --- a/init/main.c > +++ b/init/main.c > @@ -387,8 +387,6 @@ static int __init bootconfig_params(char *param, char *val, > { > if (strcmp(param, "bootconfig") == 0) { > bootconfig_found = true; > - } else if (strcmp(param, "--") == 0) { > - initargs_found = true; > } > return 0; > } > @@ -399,19 +397,23 @@ static void __init setup_boot_config(const char *cmdline) > const char *msg; > int pos; > u32 size, csum; > - char *data, *copy; > + char *data, *copy, *err; > int ret; > > /* Cut out the bootconfig data even if we have no bootconfig option */ > data = get_boot_config_from_initrd(&size, &csum); > > strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE); > - parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL, > - bootconfig_params); > + err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL, > + bootconfig_params); > > - if (!bootconfig_found) > + if (IS_ERR(err) || !bootconfig_found) > return; > > + /* parse_args() stops at '--' and returns an address */ > + if (err) > + initargs_found = true; > + > if (!data) { > pr_err("'bootconfig' found on command line, but no bootconfig found\n"); > return;