From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47E26C88E5C for ; Wed, 16 Sep 2026 07:35:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC2C510E48F; Wed, 16 Sep 2026 07:35:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="gf5L5wnm"; dkim-atps=neutral Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE10110FC1B; Tue, 15 Sep 2026 15:05:15 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 45559602C3; Tue, 15 Sep 2026 15:05:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 609DE1F00893; Tue, 15 Sep 2026 15:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789484714; bh=92Jyv3r5iRKPp9A+0MWzJBMIdxeAT/qbE/UD5yjhWE0=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=gf5L5wnmtccLwoqcVRv226Jxh21B1B//39SXNk9kc4N8OS1FTlhq9PWO0oO0C2lV5 /puLCofTcTcdOq9gexMECkzKA3ObUOxFvtdLZex77Bqia2hDmeu6n908Nd0hiX8iF9 qTYQDbAMbNgjSO8+cNHSBskD1SEuiooBkMWuneDZS5c3lKtRyIRRattmm2nfwDtRhi /vDHelzWwxEEbNDJ6m9bDtWIf3Gi0xBkpoRi48jhIlvmxyg1p97zwYUvcCDIpP4GL2 89RyOdTBK97/VTtSVGn5HnnYF5QSg1YyyyGBUWH6C6xYN7eMiLrpeTG7VTkcG879bb BqI5RrgGxycEw== Date: Tue, 15 Sep 2026 10:05:11 -0500 From: Rob Herring To: Bill Wendling Cc: linux-kernel@vger.kernel.org, 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 , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , 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 , 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 , =?iso-8859-1?Q?C=E1ssio?= Gabriel , 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 Subject: Re: [PATCH 10/28] of/fdt: Replace strlcat() with snprintf() in early_init_dt_scan_chosen() Message-ID: <20260915150511.GB1926857-robh@kernel.org> References: <20260915081910.4142719-1-morbo@google.com> <20260915081910.4142719-11-morbo@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260915081910.4142719-11-morbo@google.com> X-Mailman-Approved-At: Wed, 16 Sep 2026 07:35:16 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Sep 15, 2026 at 08:18:27AM +0000, Bill Wendling wrote: > When CONFIG_CMDLINE_EXTEND is enabled, early_init_dt_scan_chosen() uses > two strlcat() calls to append a space and CONFIG_CMDLINE to the command > line buffer. > > In preparation for removing the deprecated strlcat() API[1], replace the > strlcat() calls with a single snprintf() call using the existing string > length. > > Additionally, check for a NULL initial_boot_params pointer and jump to > "handle_cmdline" so that CONFIG_CMDLINE handling still occurs without > dereferencing a NULL FDT pointer in fdt_path_offset(). > > Link: https://github.com/KSPP/linux/issues/370 [1] > Cc: codemender-patching+linux@google.com > Assisted-by: Assistant:Claude-3.5-Sonnet [editor_update_file, shell_command_run] > Signed-off-by: Bill Wendling > --- > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index a64afc3ded3d..311021a83f03 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -1095,6 +1095,9 @@ int __init early_init_dt_scan_chosen(char *cmdline) > const void *rng_seed; > const void *fdt = initial_boot_params; > > + if (!fdt) > + goto handle_cmdline; > + > node = fdt_path_offset(fdt, "/chosen"); > if (node < 0) > node = fdt_path_offset(fdt, "/chosen@0"); > @@ -1133,8 +1136,12 @@ int __init early_init_dt_scan_chosen(char *cmdline) > */ > #ifdef CONFIG_CMDLINE > #if defined(CONFIG_CMDLINE_EXTEND) > - strlcat(cmdline, " ", COMMAND_LINE_SIZE); > - strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); > + { No need for brackets. > + size_t len = strlen(cmdline); > + > + if (len < COMMAND_LINE_SIZE) > + snprintf(cmdline + len, COMMAND_LINE_SIZE - len, " %s", CONFIG_CMDLINE); > + } > #elif defined(CONFIG_CMDLINE_FORCE) > strscpy(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); > #else > -- > 2.55.0.1032.g73a4cd73de-goog >