From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA9284A2E1B for ; Tue, 15 Sep 2026 08:28:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460902; cv=none; b=u5pU+cV1w5U6Gnr6PuZrjWHy7g67vxnD61sxL9Shdp4N31MvieEan/GR9ESqst8znuaVXJIassoPngv0dA9J6pi6+1qhWiIMzVElHtcFgA3rN9Ai2kWWiWlXrsRH+fZ3FpoiVbF2FeU26iy57ukP2vtkipvmx6ngnY6gUs3E5vY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460902; c=relaxed/simple; bh=s/FLNJ19YZGvt5oZ8eTe1yZo+b1FTWb/0ix0hrTXlNc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ocoJJYkg/sT8zs1+2N8Wb9jmhQ9Q1WbJPqpXWXx1E2s71YOeUeQ/aNpPDmxX7iSgtF7RJKU3K88M4/tQQgAmQy0TZFNhdCeMrqJw6IWMX+LITqGCqSIXj82FgCSVrjgtfHUkHifAwB7oDj9iZQFp08dyyMh+2RGE1ASwtkpLLs4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=eJTdxyeO; arc=none smtp.client-ip=209.85.210.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--morbo.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eJTdxyeO" Received: by mail-ot1-f70.google.com with SMTP id 46e09a7af769-80a4a17618dso196721a34.0 for ; Tue, 15 Sep 2026 01:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460899; x=1790065699; darn=vger.kernel.org; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date:from:to:cc :subject:date:message-id:reply-to:content-type; bh=TmKdBXO38kbe6W228p+vBZ76A7D+nQJddOBfd0uRZ54=; b=eJTdxyeODIl59AKCZk+WpAYV4/r8W188aE1vnqgVnlJ8amcIYmqcQjKm1sxGR/5CYW VzKuh4xzsutkEmwdaOizYtRutQduG0aKLtA2XAIqKXZ2IMferZV94jgWqT+iz/rGiC3/ nrUkCHfHLF+bZSNASlmrLWf4gKFyfSrSPQbe4hF1XOG+jfGJkUrg+ZG6bePMFXhVixVl +/HvzHPFJf0aDlapsCI3SAytI5rb671gJkfSX5v1q+cijB8b2BH0cnKHhZp2lieiUsbT pLqw68xfEWkAFiXwD8XEmIoGdIotaj0rhxknVx0t4wm9BFGSS1VXtQUipClf9HM5uhT/ HuSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460899; x=1790065699; h=content-transfer-encoding:content-type:cc:to:from:subject :message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TmKdBXO38kbe6W228p+vBZ76A7D+nQJddOBfd0uRZ54=; b=o9ZKko9ampoUu/jrgjrYVwZeIzFLT9LkE7g6mzJuHwauHBTu1Hn0W5gt1nEttOCDZX 132hTMUgDuLgUZZZVF7+bmVUi3oUUZH6USwjHCC+HWbxSEsPQ2/5N4/YfmJYoktXDJbc WWTWaKw2zthiPJ/ACH8IaC3fWpyhpz5y333Ui1Trb4M2tFmv0WHjykMXbqxxDCE209x+ 5vTlQ72a2bCkvX6nTZ6LWGfXemXOK2K0MDv8ai7kgT1qt6U35Pif4cFDYfNWkgvsx1JI 3nUFzFL4b6sy4nrxmJAfSWDBtSQeUOE+pVVZggny2k9/abzpulB5KcNNEapvme/KyoV5 p4zQ== X-Gm-Message-State: AFuF++nN/QMJFigQLVFtfisLcpDfSXFAlENzKBk0lStHKeKYdRKj65cd qx3br01SKxjlZNsnuJdctwio771UXAEDdoZCW/5kSOfaAw3u0zGY1wHkIRxNObUu4aMuPjauipa zcPqA5TtrGH1OnVwiAM9OLBJyFyaeQm1V6E9m8aqRaxEy+WHTIlTRQYc94RLbu/pbqh1lpS/On+ B45Ewhn65TDyE868Abi3c16Ke0PJW0C9mwmdZ9Nw== X-Received: from plw16.prod.google.com ([2002:a17:903:45d0:b0:2dd:203e:7d7f]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e544:b0:2d8:d4cf:fe49 with SMTP id d9443c01a7336-2dd7654538dmr37587935ad.15.1789460410166; Tue, 15 Sep 2026 01:20:10 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:35 +0000 In-Reply-To: <20260915081910.4142719-1-morbo@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260915081910.4142719-1-morbo@google.com> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog Message-ID: <20260915081910.4142719-19-morbo@google.com> Subject: [PATCH 18/28] LoongArch: Refactor bootcmdline_init() to use seq_buf instead of strlcat() From: Bill Wendling To: linux-kernel@vger.kernel.org Cc: Bill Wendling , codemender-patching+linux@google.com, Russell King , Huacai Chen , WANG Xuerui , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Ian Abbott , H Hartley Sweeten , Tony Luck , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matthew Brost , "=?UTF-8?q?Thomas=20Hellstr=C3=B6m?=" , Rodrigo Vivi , Dmitry Torokhov , Matthias Schwarzott , Mauro Carvalho Chehab , Tony Nguyen , Przemek Kitszel , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Arend van Spriel , Rob Herring , Saravana Kannan , Krzysztof Kozlowski , Sylwester Nawrocki , Peter Griffin , Alim Akhtar , Linus Walleij , Anil Gurumurthy , Sudarsana Kalluru , "Martin K. Petersen" , Trond Myklebust , Anna Schumaker , Mike Marshall , Martin Brandenburg , Kees Cook , Jiri Pirko , Simon Horman , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Jaroslav Kysela , Takashi Iwai , Andrew Morton , "Mike Rapoport (Microsoft)" , Kanglong Wang , Tiezhu Yang , Qiang Ma , Randy Dunlap , Pengpeng Hou , Ard Biesheuvel , Breno Leitao , Thorsten Blum , Harshit Mogalapalli , Greg Kroah-Hartman , Lyude Paul , Ashutosh Desai , Imre Deak , Dmitry Baryshkov , Johan Hovold , Johannes Berg , Miri Korenblit , Alexander Stein , Cryolitia PukNgae , Jiaming Zhang , Will Porter , Cen Zhang , "=?UTF-8?q?C=C3=A1ssio=20Gabriel?=" , Rong Zhang , Arun Raghavan , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linux-edac@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-input@vger.kernel.org, linux-media@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-scsi@vger.kernel.org, linux-nfs@vger.kernel.org, devel@lists.orangefs.org, linux-hardening@vger.kernel.org, linux-sound@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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_kerne= l_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=C3=B6m" 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=C3=A1ssio 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 =20 #include #include @@ -305,6 +306,8 @@ static void __init fdt_setup(void) =20 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; } =20 + /* Initialize seq_buf pointing to boot_command_line */ + s.buffer =3D boot_command_line; + s.size =3D COMMAND_LINE_SIZE; + s.len =3D 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, " "); =20 - 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); =20 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); } =20 /* * 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); =20 out: --=20 2.55.0.1032.g73a4cd73de-goog