bootcmdline_init() uses multiple strlcat() calls to append init_command_line or CONFIG_CMDLINE to boot_command_line. In preparation for removing the deprecated strlcat() API[1], initialize a struct seq_buf with the existing contents of boot_command_line and use seq_buf_puts() to append the command line fragments. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:1.0 [shell_command_run, editor_update_file, make_kernel_build_single_file] Signed-off-by: Bill Wendling --- Cc: Russell King Cc: Huacai Chen Cc: WANG Xuerui Cc: Thomas Bogendoerfer Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: Ian Abbott Cc: H Hartley Sweeten Cc: Tony Luck Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: Matthew Brost Cc: "Thomas Hellström" Cc: Rodrigo Vivi Cc: Dmitry Torokhov Cc: Matthias Schwarzott Cc: Mauro Carvalho Chehab Cc: Tony Nguyen Cc: Przemek Kitszel Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Arend van Spriel Cc: Rob Herring Cc: Saravana Kannan Cc: Krzysztof Kozlowski Cc: Sylwester Nawrocki Cc: Peter Griffin Cc: Alim Akhtar Cc: Linus Walleij Cc: Anil Gurumurthy Cc: Sudarsana Kalluru Cc: "Martin K. Petersen" Cc: Trond Myklebust Cc: Anna Schumaker Cc: Mike Marshall Cc: Martin Brandenburg Cc: Kees Cook Cc: Jiri Pirko Cc: Simon Horman Cc: Chuck Lever Cc: Jeff Layton Cc: NeilBrown Cc: Olga Kornievskaia Cc: Dai Ngo Cc: Tom Talpey Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: Bill Wendling Cc: Andrew Morton Cc: "Mike Rapoport (Microsoft)" Cc: Kanglong Wang Cc: Tiezhu Yang Cc: Qiang Ma Cc: Randy Dunlap Cc: Pengpeng Hou Cc: Ard Biesheuvel Cc: Breno Leitao Cc: Thorsten Blum Cc: Harshit Mogalapalli Cc: Greg Kroah-Hartman Cc: Lyude Paul Cc: Ashutosh Desai Cc: Imre Deak Cc: Dmitry Baryshkov Cc: Johan Hovold Cc: Johannes Berg Cc: Miri Korenblit Cc: Alexander Stein Cc: Cryolitia PukNgae Cc: Jiaming Zhang Cc: Will Porter Cc: Cen Zhang Cc: "Cássio Gabriel" Cc: Rong Zhang Cc: Arun Raghavan Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: loongarch@lists.linux.dev Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-edac@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org Cc: linux-input@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: brcm80211@lists.linux.dev Cc: brcm80211-dev-list.pdl@broadcom.com Cc: devicetree@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org Cc: linux-gpio@vger.kernel.org Cc: linux-scsi@vger.kernel.org Cc: linux-nfs@vger.kernel.org Cc: devel@lists.orangefs.org Cc: linux-hardening@vger.kernel.org Cc: linux-sound@vger.kernel.org --- arch/loongarch/kernel/setup.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 6fa4a22a58fd..826396f141b9 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -305,6 +306,8 @@ static void __init fdt_setup(void) static void __init bootcmdline_init(char **cmdline_p) { + struct seq_buf s; + /* * If CONFIG_CMDLINE_FORCE is enabled then initializing the command line * is trivial - we simply use the built-in command line unconditionally & @@ -315,6 +318,11 @@ static void __init bootcmdline_init(char **cmdline_p) goto out; } + /* Initialize seq_buf pointing to boot_command_line */ + s.buffer = boot_command_line; + s.size = COMMAND_LINE_SIZE; + s.len = strlen(boot_command_line); + #ifdef CONFIG_OF_FLATTREE /* * If CONFIG_CMDLINE_BOOTLOADER is enabled and we are in FDT-based system, @@ -323,11 +331,11 @@ static void __init bootcmdline_init(char **cmdline_p) * to boot_command_line. */ if (initial_boot_params) { - if (boot_command_line[0]) - strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); + if (s.len) + seq_buf_puts(&s, " "); - if (!strstr(boot_command_line, init_command_line)) - strlcat(boot_command_line, init_command_line, COMMAND_LINE_SIZE); + if (!strstr(s.buffer, init_command_line)) + seq_buf_puts(&s, init_command_line); goto out; } @@ -338,14 +346,14 @@ static void __init bootcmdline_init(char **cmdline_p) * CONFIG_CMDLINE_EXTEND is enabled. */ if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) && CONFIG_CMDLINE[0]) { - strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); - strlcat(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); + seq_buf_puts(&s, " "); + seq_buf_puts(&s, CONFIG_CMDLINE); } /* * Use built-in command line if the bootloader command line is empty. */ - if (IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && !boot_command_line[0]) + if (IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && !s.len) strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); out: -- 2.55.0.1032.g73a4cd73de-goog