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 6E022C88E53 for ; Tue, 15 Sep 2026 14:13:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DBB3910E2E6; Tue, 15 Sep 2026 14:13:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="VvXExnxT"; dkim-atps=neutral Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A63210F34C for ; Tue, 15 Sep 2026 08:20:08 +0000 (UTC) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3965ba1ba3eso5167822a91.2 for ; Tue, 15 Sep 2026 01:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460408; x=1790065208; darn=lists.freedesktop.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=jabuqrMs8PQTYoTuRH1Tce2jM5ZfyHhnXojFxmEofr0=; b=VvXExnxTVlFg9Zt4PHa7nWDjvwAeUpHMPtYbicYcs2fsTX06OwJz2MZVTYT1QI2xnN X7CE0/+gr4RQ/09LjjtDA/TLLq8OVJ5XH4U9Dd/u0eydjhzLaHZG6N4klx8mmvTxFBAg hWEijeE6Ka6calN7KO0c9ygUf4VUvw57wOc6SDKjjjcjpxHqvcPa9W9xerzVaCeIj/hK Ysp1fq35p/PCK58NNGAjg8KxSSswB6FIptD/mAR7R1zDGo3QBWlq+axJtyGDA3wyyAZI 78tHIWSZcg6h40v+vIaY3DEiLyqSfZdRb+Oz5RU8NZb4UNtwBiFDKRDGsMQGLEgf1hej WeaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460408; x=1790065208; 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=jabuqrMs8PQTYoTuRH1Tce2jM5ZfyHhnXojFxmEofr0=; b=V9ndtuc1Iaj0/ahsnq/AH8e90rVzfIG8eNhJRhVs7WoGz/yWMC0NOcxhbV3SGk/x+h UE4GxgDp4b2ja0r31iwy3VCP/kk13f4RP/4DMeCcg4sL7M46sVQ4VRhrnhfS3W/mCtCB vOizE5qBM9EaBJLfK5AUbyzxZEOgqPGWrv19Yn6t3Q2RJLB911bHIl+8SCeD/aESndmo jPveL3Wpd5MxJEvOxfb4baqDjvwRJsWlZ86XtyRgaq6dTcami/k6hBAPcAiwhBjna8cx LJscrhrc+BHtip59+EMNP+vtGx45XIlCAk6LayS7oTMF7TiLa05e5iES1gzXEZSxLyhA QERg== X-Forwarded-Encrypted: i=1; AKwUvBwlsv4eErFvtdbTlZytKFjVvI2cQSvMD/dYEsqWFF4aZvScxIbAmDy/QSfIQ2RnkNJl2DXK+jhpng==@lists.freedesktop.org X-Gm-Message-State: AFuF++mjEXP32B0kAc/LyFzJuAN3ymRNjmOuFEyF7ETLEnX13QvcCzJZ 2Pczx5fV+20SxT5ymfos+60IzrvnvSAFr//VtzKdG0CWJLxt1m7xRRQIoJ0BQGArEzNoAGSYRUp s X-Received: from plde9.prod.google.com ([2002:a17:902:d389:b0:2db:820a:9228]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f786:b0:2dd:4070:8f5 with SMTP id d9443c01a7336-2dd6c758602mr148465515ad.21.1789460407562; Tue, 15 Sep 2026 01:20:07 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:32 +0000 In-Reply-To: <20260915081910.4142719-1-morbo@google.com> 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-16-morbo@google.com> Subject: [PATCH 15/28] orangefs: Use seq_buf for debug help string generation 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 X-Mailman-Approved-At: Tue, 15 Sep 2026 14:13:02 +0000 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" orangefs_prepare_debugfs_help_string() constructs the debugfs help text in a dynamically allocated buffer using repeated strlcat() calls across keyword loops, rescanning the buffer on every append. In preparation for removing the deprecated strlcat() API[1], use struct seq_buf to build the help string. This tracks the write position across the loops, allows formatting each keyword line with a single seq_buf_printf() call, and checks for truncation via seq_buf_has_overflowed(). Additionally, replace the final strlcat() call that copies the completed string into debug_help_string with strscpy(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini:gemini-2.0-flash-exp [shell_command_run, editor_update_= 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 --- fs/orangefs/orangefs-debugfs.c | 36 +++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.= c index 9f94919a6bc6..6e2f9887eab4 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c @@ -37,6 +37,7 @@ */ #include #include +#include =20 #include =20 @@ -623,10 +624,10 @@ int orangefs_prepare_debugfs_help_string(int at_boot) char *client_title =3D "Client Debug Keywords:\n"; char *kernel_title =3D "Kernel Debug Keywords:\n"; size_t string_size =3D DEBUG_HELP_STRING_SIZE; - size_t result_size; size_t i; char *new; int rc =3D -EINVAL; + struct seq_buf s; =20 gossip_debug(GOSSIP_UTILS_DEBUG, "%s: start\n", __func__); =20 @@ -640,17 +641,14 @@ int orangefs_prepare_debugfs_help_string(int at_boot) goto out; } =20 + seq_buf_init(&s, new, string_size); + /* - * strlcat(dst, src, size) will append at most - * "size - strlen(dst) - 1" bytes of src onto dst, - * null terminating the result, and return the total - * length of the string it tried to create. - * * We'll just plow through here building our new debug - * help string and let strlcat take care of assuring that + * help string and let seq_buf take care of assuring that * dst doesn't overflow. */ - strlcat(new, client_title, string_size); + seq_buf_puts(&s, client_title); =20 if (!at_boot) { =20 @@ -665,24 +663,18 @@ int orangefs_prepare_debugfs_help_string(int at_boot) goto out; } =20 - for (i =3D 0; i < cdm_element_count; i++) { - strlcat(new, "\t", string_size); - strlcat(new, cdm_array[i].keyword, string_size); - strlcat(new, "\n", string_size); - } + for (i =3D 0; i < cdm_element_count; i++) + seq_buf_printf(&s, "\t%s\n", cdm_array[i].keyword); } =20 - strlcat(new, "\n", string_size); - strlcat(new, kernel_title, string_size); + seq_buf_puts(&s, "\n"); + seq_buf_puts(&s, kernel_title); =20 - for (i =3D 0; i < num_kmod_keyword_mask_map; i++) { - strlcat(new, "\t", string_size); - strlcat(new, s_kmod_keyword_mask_map[i].keyword, string_size); - result_size =3D strlcat(new, "\n", string_size); - } + for (i =3D 0; i < num_kmod_keyword_mask_map; i++) + seq_buf_printf(&s, "\t%s\n", s_kmod_keyword_mask_map[i].keyword); =20 /* See if we tried to put too many bytes into "new"... */ - if (result_size >=3D string_size) { + if (seq_buf_has_overflowed(&s)) { kfree(new); goto out; } @@ -692,7 +684,7 @@ int orangefs_prepare_debugfs_help_string(int at_boot) } else { mutex_lock(&orangefs_help_file_lock); memset(debug_help_string, 0, DEBUG_HELP_STRING_SIZE); - strlcat(debug_help_string, new, string_size); + strscpy(debug_help_string, new, DEBUG_HELP_STRING_SIZE); mutex_unlock(&orangefs_help_file_lock); kfree(new); } --=20 2.55.0.1032.g73a4cd73de-goog