[PATCH 20/28] parisc: Refactor strlcat() to seq_buf in setup_cmdline()
From: Bill Wendling <morbo@google.com>
Date: 2026-09-15 08:20:18
Also in:
dri-devel, intel-wired-lan, intel-xe, linux-devicetree, linux-edac, linux-gpio, linux-hardening, linux-media, linux-mips, linux-nfs, linux-samsung-soc, linux-scsi, linux-sound, linux-wireless, lkml, loongarch, netdev
Subsystem:
parisc architecture, the rest · Maintainers:
"James E.J. Bottomley", Helge Deller, Linus Torvalds
setup_cmdline() uses multiple strlcat() calls to conditionally append default console and earlycon parameters to boot_command_line. In preparation for removing the deprecated strlcat() API[1], initialize a struct seq_buf with the existing boot_command_line contents and use seq_buf_printf() to append the console parameters. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:Gemini-1.5-Pro [editor_update_file, shell_command_run] Signed-off-by: Bill Wendling <morbo@google.com> --- Cc: Russell King <linux@armlinux.org.uk> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: WANG Xuerui <kernel@xen0n.name> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: Thomas Gleixner <tglx@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@gmail.com> Cc: Simona Vetter <simona@ffwll.ch> Cc: Matthew Brost <matthew.brost@intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Matthias Schwarzott <zzam@gentoo.org> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Tony Nguyen <anthony.l.nguyen@intel.com> Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com> Cc: Andrew Lunn <andrew+netdev@lunn.ch> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Arend van Spriel <arend.vanspriel@broadcom.com> Cc: Rob Herring <robh@kernel.org> Cc: Saravana Kannan <saravanak@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Cc: Peter Griffin <peter.griffin@linaro.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Linus Walleij <linusw@kernel.org> Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com> Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> Cc: "Martin K. Petersen" <mkp@kernel.org> Cc: Trond Myklebust <trondmy@kernel.org> Cc: Anna Schumaker <anna@kernel.org> Cc: Mike Marshall <hubcap@omnibond.com> Cc: Martin Brandenburg <martin@omnibond.com> Cc: Kees Cook <kees@kernel.org> Cc: Jiri Pirko <jiri@resnulli.us> Cc: Simon Horman <horms@kernel.org> Cc: Chuck Lever <cel@kernel.org> Cc: Jeff Layton <jlayton@kernel.org> Cc: NeilBrown <neil@brown.name> Cc: Olga Kornievskaia <okorniev@redhat.com> Cc: Dai Ngo <Dai.Ngo@oracle.com> Cc: Tom Talpey <tom@talpey.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: Bill Wendling <morbo@google.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: "Mike Rapoport (Microsoft)" <rppt@kernel.org> Cc: Kanglong Wang <redacted> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Qiang Ma <redacted> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Pengpeng Hou <redacted> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Breno Leitao <leitao@debian.org> Cc: Thorsten Blum <blum@kernel.org> Cc: Harshit Mogalapalli <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Lyude Paul <lyude@redhat.com> Cc: Ashutosh Desai <redacted> Cc: Imre Deak <redacted> Cc: Dmitry Baryshkov <redacted> Cc: Johan Hovold <johan@kernel.org> Cc: Johannes Berg <redacted> Cc: Miri Korenblit <miriam.rachel.korenblit@intel.com> Cc: Alexander Stein <redacted> Cc: Cryolitia PukNgae <cryolitia@uniontech.com> Cc: Jiaming Zhang <redacted> Cc: Will Porter <redacted> Cc: Cen Zhang <redacted> Cc: "Cássio Gabriel" <redacted> Cc: Rong Zhang <redacted> Cc: Arun Raghavan <redacted> 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/parisc/kernel/setup.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index d3e17a7a8901..fa3efc82ad87 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c@@ -17,6 +17,7 @@ #include <linux/init.h> #include <linux/console.h> #include <linux/seq_file.h> +#include <linux/seq_buf.h> #define PCI_DEBUG #include <linux/pci.h> #undef PCI_DEBUG
@@ -42,6 +43,7 @@ static char __initdata command_line[COMMAND_LINE_SIZE]; static void __init setup_cmdline(char **cmdline_p) { extern unsigned int boot_args[]; + struct seq_buf s; char *p; *cmdline_p = command_line;
@@ -54,19 +56,21 @@ static void __init setup_cmdline(char **cmdline_p) strscpy(boot_command_line, (char *)__va(boot_args[1]), COMMAND_LINE_SIZE); + s.buffer = boot_command_line; + s.size = COMMAND_LINE_SIZE; + s.len = strlen(boot_command_line); + /* autodetect console type (if not done by palo yet) */ p = boot_command_line; if (!str_has_prefix(p, "console=") && !strstr(p, " console=")) { - strlcat(p, " console=", COMMAND_LINE_SIZE); - if (PAGE0->mem_cons.cl_class == CL_DUPLEX) - strlcat(p, "ttyS0", COMMAND_LINE_SIZE); - else - strlcat(p, "tty0", COMMAND_LINE_SIZE); + seq_buf_printf(&s, " console=%s", + PAGE0->mem_cons.cl_class == CL_DUPLEX ? + "ttyS0" : "tty0"); } /* default to use early console */ if (!strstr(p, "earlycon")) - strlcat(p, " earlycon=pdc", COMMAND_LINE_SIZE); + seq_buf_printf(&s, " earlycon=pdc"); #ifdef CONFIG_BLK_DEV_INITRD /* did palo pass us a ramdisk? */
--
2.55.0.1032.g73a4cd73de-goog