Received-SPF: pass (google.com: domain of linux-kernel+bounces-139953-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240411041200.225356-1-ytcoode@gmail.com>
In-Reply-To: <20240411041200.225356-1-ytcoode@gmail.com>
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 11 Apr 2024 09:18:22 +0200
Message-ID: <CAMuHMdWA_cX9sbMjoZa-LoXfiH5bTAWmQNXS-srEwhj9X5knGw@mail.gmail.com>
Subject: Re: [PATCH] init/main.c: Remove redundant space from saved_command_line
To: Yuntao Wang <ytcoode@gmail.com>
Cc: linux-kernel@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, 
	"Peter Zijlstra (Intel)" <peterz@infradead.org>, Andrew Morton <akpm@linux-foundation.org>, 
	Josh Poimboeuf <jpoimboe@kernel.org>, "ndesaulniers@google.com" <ndesaulniers@google.com>, Tejun Heo <tj@kernel.org>, 
	Christophe Leroy <christophe.leroy@csgroup.eu>, Krister Johansen <kjlx@templeofstupid.com>, 
	Changbin Du <changbin.du@huawei.com>, Arnd Bergmann <arnd@arndb.de>, 
	Geert Uytterhoeven <geert+renesas@glider.be>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

CC Masami Hiramatsu <mhiramat@kernel.org>

On Thu, Apr 11, 2024 at 6:13=E2=80=AFAM Yuntao Wang <ytcoode@gmail.com> wro=
te:
> extra_init_args ends with a space, so when concatenating extra_init_args
> to saved_command_line, be sure to remove the extra space.
>
> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> ---
>  init/main.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/init/main.c b/init/main.c
> index 2ca52474d0c3..cf2c22aa0e8c 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -660,12 +660,14 @@ static void __init setup_command_line(char *command=
_line)
>                         strcpy(saved_command_line + len, extra_init_args)=
;
>                         len +=3D ilen - 4;        /* strlen(extra_init_ar=
gs) */
>                         strcpy(saved_command_line + len,
> -                               boot_command_line + initargs_offs - 1);
> +                               boot_command_line + initargs_offs);
>                 } else {
>                         len =3D strlen(saved_command_line);
>                         strcpy(saved_command_line + len, " -- ");
>                         len +=3D 4;
>                         strcpy(saved_command_line + len, extra_init_args)=
;
> +                       len +=3D ilen - 4; /* strlen(extra_init_args) */
> +                       saved_command_line[len-1] =3D '\0'; /* remove tra=
iling space */
>                 }
>         }

Gr{oetje,eeting}s,

                        Geert

--=20
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k=
org

In personal conversations with technical people, I call myself a hacker. Bu=
t
when I'm talking to journalists I just say "programmer" or something like t=
hat.
                                -- Linus Torvalds