From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (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 59A164A0925 for ; Tue, 15 Sep 2026 08:27:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.72 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460856; cv=none; b=FbVqwjWTCX8jAWjU2UUGMVx8gCE0gseRZ+zGWvu7gsfNo8llLYHJUf0o0rGNz6sFRl5xUG6bSPZcQVpCYjxdEo5JcDPCL8lziUF4xF0bGLw2521CjDA0PlqPJmSxKJ+Yeqm28pNB7NS8N7SqxgHbvcAed3y1zsGtpXiAtlyB1/M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460856; c=relaxed/simple; bh=Hbrp06lq3B7opj8tzjJVqcfrxhhZTvzJ1WqUPePmYuc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=q6XR4mrBQwn8hNtGewEb41YApOm9nAIv5TGvwrfP6FywsUW1Xj6qrtyjniUAYtLyED5+zCVt+YRDvnIwwCuHHkpwDqM46x029POId46TDxhJhs6fjO9qWXndSWD0RjAtis2mWP667zZIjjI/3GRipaOpA/U6O9azOGImQnYMaKU= 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=uDNCbO4F; arc=none smtp.client-ip=209.85.216.72 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="uDNCbO4F" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-39b6416441eso8122921a91.1 for ; Tue, 15 Sep 2026 01:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460854; x=1790065654; darn=lists.linux.dev; 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=tzVl62qjzRm92BALDDypl3TnCOJSNAaLaOJ/zmWRh10=; b=uDNCbO4Fblkwf4ER1jmCfJosbL1YG9dqkKN5OCQ0THlG/BkX87eykGZI1SyyzYkj2o RTdvDn/AzrmE8xr2dfYHapxcEhEeTI+ppNhbjJPUzbOG3gXSOJtgGPAF0Z8coMs4+JE6 4lcT2tfsKPOw4udW8g3fIhYFU08Pv31LFvmp69xeWBzcZqep22+bP8WkU9zIHIp1OwqD a5JrHlDmwz8WCtqhPXsFILQFQjdVX2YxA7a3joydirFeWRGzUfbZQNud5XSzg31OidLG UKumYY1YGH4knNrJhulvojVzy7S4eH/WsEbPFQErDxvM/mxvHi/uml9bHfVCpGCn+Qqo 74UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460854; x=1790065654; 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=tzVl62qjzRm92BALDDypl3TnCOJSNAaLaOJ/zmWRh10=; b=bYpKh/5qGnzzLoZaK04MWnH78HUovbgujOp067p1mjUZ2VCQjiu2iBvnrBvKqp62Rr 04o5mn9O/Rr8y7RSHWxVKnNDeWCZXCruowJICfFhap88ZJvlQy4OUa0ZU9sDm1ibz1v5 /NefjzVjhXsjmqTT2a8I1JIh7yT36svMwcaanzoKeBEGKgpI36i1cP2IpRj2NKbX25vU daj0OGjRwjYoRQjBFjhZ6E42s/lGneoXP+HpZFqtgS7Q2O5CJiGiO5N5+fnzSLaO4/FX Tj7eZZ5Qwe8qFtl53dqVEVrbXdGyGXx5He4MBfG4SgaDiEnnDeA6WvMLM9miVZTmykuy 5NWg== X-Forwarded-Encrypted: i=1; AKwUvByVzmdhqMK5UdIzfFWQGsBVrGgxm8Gu1W5dZBxhIZHqsFiysgY4g+6fInGfGFacySMszrq75aC7UmU=@lists.linux.dev X-Gm-Message-State: AFuF++lZ7f/dX4tIs0bWSTVHHmflmeWCGrBODjJUBl2txuhBGRm98UHX ZRzufp74nnr8gf27rr9W6tGPZcnCXdUEHPf+mengX70mZ8EA5ggJ42oio84NelsLskQ3Gd+Tmax g X-Received: from plbjx4.prod.google.com ([2002:a17:903:1384:b0:2dd:1457:fac8]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:190d:b0:2dd:4168:7bd3 with SMTP id d9443c01a7336-2dd6c6c0cb1mr140747065ad.12.1789460411041; Tue, 15 Sep 2026 01:20:11 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:36 +0000 In-Reply-To: <20260915081910.4142719-1-morbo@google.com> Precedence: bulk X-Mailing-List: loongarch@lists.linux.dev 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-20-morbo@google.com> Subject: [PATCH 19/28] x86/setup: Use snprintf() to concatenate builtin and boot command lines 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 When CONFIG_CMDLINE_BOOL is enabled without CONFIG_CMDLINE_OVERRIDE, setup_arch() appends boot_command_line to builtin_cmdline using two strlcat() calls before copying the result back to boot_command_line. In preparation for removing the deprecated strlcat() API[1], format the combined command line into a temporary buffer using a single snprintf() call and copy the result to both builtin_cmdline and boot_command_line. Using a temporary buffer avoids undefined behavior from passing overlapping source and destination buffers to snprintf(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Developer:Gemini_2.5_Pro [editor_update_file, make_kernel_buil= d_single_file, checkpatch_run] 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/x86/kernel/setup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index cda6adb9f69c..c40e0edd7c13 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -916,9 +916,11 @@ void __init setup_arch(char **cmdline_p) #else if (builtin_cmdline[0]) { /* append boot loader cmdline to builtin */ - strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE); - strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE); - strscpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE); + char tmp[COMMAND_LINE_SIZE]; + + snprintf(tmp, COMMAND_LINE_SIZE, "%s %s", builtin_cmdline, boot_command_= line); + strscpy(builtin_cmdline, tmp, COMMAND_LINE_SIZE); + strscpy(boot_command_line, tmp, COMMAND_LINE_SIZE); } #endif builtin_cmdline_added =3D true; --=20 2.55.0.1032.g73a4cd73de-goog