From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (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 58F0F3F1AD5 for ; Tue, 15 Sep 2026 08:19:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460419; cv=none; b=jPqxSUugAsjQRLUQna9pAUHHNkJdWbzyc90ByWDvOTqF+yiiCwYW5FpQ9l32VE4EbVzZLPdWXe+0Kg1oFPKDFWv8yrgRBZmDqB/811y7VVnv0wgTRlMR45AjbeXkHSFvkt6FjGT4Hq5ok/P/6uUeMhdYVuEUTqzLgE1X3GqhxGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460419; c=relaxed/simple; bh=3J3N+DkEy3lsWD9J78HZ6sRSStJ4fxxRHSgFL3P+msA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EgNCgvbcF6IHUVnEhy+0u2QYnJlGdWUT5Ir8cT6fu1rZQCh3GZ4i9+G7TJO/i+s4fPXTBgehkhWSqvesy6lRGmgyKcmMrelfnXBDM0YFNfWGmYninG1VsOAtX1nkknblCtalWgBGHGvVx8sG0A4Ck13CHNx9oLxGnwVsVINszrw= 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=g2AdJos4; arc=none smtp.client-ip=209.85.215.197 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="g2AdJos4" Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-cc21bc2923fso4079656a12.2 for ; Tue, 15 Sep 2026 01:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460391; x=1790065191; 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=12RWpnF69Y0ZtQBdjS9tdwBwekyotqtFAvTiEZFvq+s=; b=g2AdJos46Mtym7lvEJ+dbl0ZCkOvWAPv0rJVI43yEHwxquhQMK+3reTZdXNfXP8VD+ 6hPLgmZnF4+qck7zfGyjpevr+dF1P8pIvNyOHE0mc8RLn71dO7RnRYH6UROyEKnAoW7a 2ky1vdcN+Dpc79EltmZRlvr5pUHgu8I6FcOqsUcyoqaGJgUEPf3o2NayBrv2N+iE2FZY erqn04ZXqhtBOln9pU819ZerSrg8ZJo+Cl6cYlyrhjnazeo6wDTQk5z1J3tCwzFmN9pz tGkcXnJRPuN1Df+HfC+evoPaU5akAbR2FIklHaSxfUQVd5jCcLDlJNMPfsPN3EklMSWI Jd4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460391; x=1790065191; 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=12RWpnF69Y0ZtQBdjS9tdwBwekyotqtFAvTiEZFvq+s=; b=0idyKLI8jARrqoyYBr/vh7m8DpOL82mZBx/Q/IsFikVIwfxjVU5ZjPlpHary5lVzFn riF6nImeYKqBfsx3ATNpeeRDn3Wh7u3l6wVP56PA6jxGeca8NWAjn82EKn9QIqBQ5XdB Z/TfWZxfcQBGZVr0zcvBPoZRPnGs4QVN5hoO8wI8ocfH6ykAlJk2zrJe0tqbW3phWNtb 71Hpgq0Guw73LmqIE/d/WboR0QzNYj3coQbtVXlTIgfLnoW1YjLXGBq+C0K7xa8vdJ94 ZQ+XX2obM+FPhWawwtDuCJ54s+zUJSQG5kFUEKLC9f/USef4T6KG03vGidnogpI1hcUa TPIg== X-Gm-Message-State: AFuF++nmYxJd1gloj3l5inT8cwqiVlUvavsXo9dGjJO2GmVLK6Xk+/Tn rj/8TFYLMo+nueMUb+i/lDJWE49LCNE5qsRfNcqmusQIfZgfgZCygGuIVo8WSUswAMJPQTFMv/T HIjdAp4rc6l+8+Q17+BfHnNaGySxN33I/yx96w8ufw8G8v9H9ov6xL1o71CJkP5ch2mgbgwX57t R4J3xbjGTPe5EXFmSTBUhms06RfThi3hq/zCzHuA== X-Received: from pgdo4-n2.prod.google.com ([2002:a05:6a02:6204:20b0:cc4:31fa:cb70]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2587:b0:3d1:c99f:efbf with SMTP id adf61e73a8af0-3db405a991dmr13264267637.14.1789460389672; Tue, 15 Sep 2026 01:19:49 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:18 +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-2-morbo@google.com> Subject: [PATCH 01/28] ALSA: ac97: Refactor snd_ac97_get_name() to use snprintf() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" snd_ac97_get_name() appends the codec name using two strlcat() calls and then appends the revision using an unbounded sprintf() at "name + strlen(name)", which could overflow the destination buffer. In preparation for removing the deprecated strlcat() API[1], replace the strlcat() and sprintf() calls with a single snprintf() using the existing string length, matching the pattern already used in the "else" branch. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Claude-3-5-Sonnet:20241022 [editor_update_file, shell_command_= 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 --- sound/pci/ac97/ac97_codec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 0bb65be021d9..e145099ee02a 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -1850,10 +1850,12 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsig= ned int id, char *name, =20 pid =3D look_for_codec_id(snd_ac97_codec_ids, id); if (pid) { - strlcat(name, " ", maxlen); - strlcat(name, pid->name, maxlen); + int l =3D strlen(name); + if (pid->mask !=3D 0xffffffff) - sprintf(name + strlen(name), " rev %u", id & ~pid->mask); + snprintf(name + l, maxlen - l, " %s rev %u", pid->name, id & ~pid->mask= ); + else + snprintf(name + l, maxlen - l, " %s", pid->name); if (ac97 && pid->patch) { if ((modem && (pid->flags & AC97_MODEM_PATCH)) || (! modem && ! (pid->flags & AC97_MODEM_PATCH))) @@ -1861,6 +1863,7 @@ void snd_ac97_get_name(struct snd_ac97 *ac97, unsigne= d int id, char *name, } } else { int l =3D strlen(name); + snprintf(name + l, maxlen - l, " id %x", id & 0xff); } } --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 98B7741441F for ; Tue, 15 Sep 2026 08:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460427; cv=none; b=QNP+j0C8uzOGdqUuXIIQRtWB1QTemaWv/kfLTuAr+KRVPmIvZ98xgjE3weR/7tT/O69UhPoJZPJ2nVPqQdI7mNj4+KKxe5LVV+Y8eZ60wGk2W/T7+ZV0XYFKBRBlK1QQ36rJQrNnYGGP0Vb6aHs3XnsRvgs8yCQ7aqXm84pBG7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460427; c=relaxed/simple; bh=AdZQZFBZ+Sq+Xs3+ioKoxuNwDqkD/CEsMpiPWsVgYCg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=c84HoGTu9RjvSW0CkzcyFg5FMztJoxkq8CYB5t4I6yREpz2bueAFFx4Y7eBUq8xdDiBU1wH0EuaKr3KeB4vTYFe3R6AI6mMVYkQRHccl9785SyoHXkca/Wo+8mNNRKhUQHaZ9veD9+29boZhJmB38NlcGnnqVQRbXmrF/+mxB24= 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=e7zvsQ58; arc=none smtp.client-ip=209.85.214.198 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="e7zvsQ58" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2cc73f47bdcso54166115ad.3 for ; Tue, 15 Sep 2026 01:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460391; x=1790065191; 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=i189Z1372pvpafDRMVnLFn5IBf8O4Z3ONLFW1RCweBo=; b=e7zvsQ58BkKTiZW4t1dlacydlPXAyV5l7nrlXWGuEnl8ITedm+WZqimRu2Ntz065t4 I00TgGLvLcai1VOpDqY0l/EmyYeA0dDc4gRltA0iwoBuD923CtGSmNfi9u9sahP1oR+K +PaHxh0VGG2vE2cFpXvFEfHpfHHTARCVZhCjplJ0URdGB5zttT3AV1tLmrrSgbBz7J2/ Xgv6ZWPZW4F0K1qnOdSxXmsxvR33uIEkdKSrtfzlnQjv/HtRWJdOf7qBTgXuMM7+1MAI tuPOpJAlqeiQhLvD6+3+vnZBbW8J5frLP8RFZPhZ9ByDYqh23hwk1njZ31sP7KgvAB5R +hqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460391; x=1790065191; 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=i189Z1372pvpafDRMVnLFn5IBf8O4Z3ONLFW1RCweBo=; b=L32xoLcGSEvbFgbiXjCkyp/01TYa6bMKf0HmgsaalRPlfjwW16PLOapdWlKEK16aQF 8WxOQgXECUa8/wnTF5TFyxSIjvtRU3dk1R/N2EISCPdm5r/EaM5OwR+HJ9Ahks9NnQ5n Ojzk/Ntfer78EwtAMlrsJ1LHt7CwsarEdJVqYrkNK+3XSUtk0QP/rmw4PYAs5zoNF4hU 07CvCG69x0hwY4suN/IfXB/aDyjlRB8B+kKJkqs3u/QrVw60PqgvLWhM9AyKOJUFqJwL OWOrlcfgqDzbmpXe0D7bcvaHBRXF5pEJ5yMH5r8/txnHyyXsPMdylFHn8o4Tdx7xsWMa Hxqg== X-Gm-Message-State: AFuF++kXrl6Byl6wMIOm3rvkpgHQ40d98p0jx+03PuhAE8S0MOBq8tKB LBhT3EF2usQPmlUVXYEfRUqzvORx95G7nI/kZ0r/QkDxYRqwGECyMemCEsNa1gpNIurUUV/Fkns JMmui6iKeV+4C9Xx6EI+tGmB6UHUEOmNox7DH004Bz+GSx4cHABRcn4C6X/Va9114re9rXHYCLH xgmXc7gsPYAcfsWfH1KGHNMm4SpPce9O4UBpbGrQ== X-Received: from plrd12.prod.google.com ([2002:a17:902:aa8c:b0:2db:8b6a:31a7]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:388d:b0:2dd:143:d5 with SMTP id d9443c01a7336-2dd6c75a396mr155065525ad.22.1789460390543; Tue, 15 Sep 2026 01:19:50 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:19 +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-3-morbo@google.com> Subject: [PATCH 02/28] sunrpc: Refactor rpc_sockaddr2uaddr() to use snprintf() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" rpc_sockaddr2uaddr() formats the IP address into "addrbuf", formats the port into a temporary "portbuf" buffer with snprintf(), and then appends "portbuf" to "addrbuf" using strlcat(). In preparation for removing the deprecated strlcat() API[1], capture the length returned by rpc_ntop4() and rpc_ntop6_noscopeid() and format the port directly onto the end of "addrbuf" with snprintf(). This eliminates the strlcat() call and the temporary "portbuf" buffer. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:3.5-sonnet [editor_update_file, shell_command_run] Signed-off-by: Bill Wendling Reviewed-by: Jeff Layton --- 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 --- net/sunrpc/addr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 97ff11973c49..a1e4173e5a53 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c @@ -264,18 +264,20 @@ EXPORT_SYMBOL_GPL(rpc_pton); */ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, gfp_t gfp_flags) { - char portbuf[RPCBIND_MAXUADDRPLEN]; char addrbuf[RPCBIND_MAXUADDRLEN]; unsigned short port; + size_t len; =20 switch (sap->sa_family) { case AF_INET: - if (rpc_ntop4(sap, addrbuf, sizeof(addrbuf)) =3D=3D 0) + len =3D rpc_ntop4(sap, addrbuf, sizeof(addrbuf)); + if (len =3D=3D 0 || len >=3D sizeof(addrbuf)) return NULL; port =3D ntohs(((struct sockaddr_in *)sap)->sin_port); break; case AF_INET6: - if (rpc_ntop6_noscopeid(sap, addrbuf, sizeof(addrbuf)) =3D=3D 0) + len =3D rpc_ntop6_noscopeid(sap, addrbuf, sizeof(addrbuf)); + if (len =3D=3D 0 || len >=3D sizeof(addrbuf)) return NULL; port =3D ntohs(((struct sockaddr_in6 *)sap)->sin6_port); break; @@ -283,11 +285,8 @@ char *rpc_sockaddr2uaddr(const struct sockaddr *sap, g= fp_t gfp_flags) return NULL; } =20 - if (snprintf(portbuf, sizeof(portbuf), - ".%u.%u", port >> 8, port & 0xff) >=3D (int)sizeof(portbuf)) - return NULL; - - if (strlcat(addrbuf, portbuf, sizeof(addrbuf)) >=3D sizeof(addrbuf)) + if (snprintf(addrbuf + len, sizeof(addrbuf) - len, + ".%u.%u", port >> 8, port & 0xff) >=3D sizeof(addrbuf) - len) return NULL; =20 return kstrdup(addrbuf, gfp_flags); @@ -352,3 +351,4 @@ size_t rpc_uaddr2sockaddr(struct net *net, const char *= uaddr, return 0; } EXPORT_SYMBOL_GPL(rpc_uaddr2sockaddr); + --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 82C523D8104 for ; Tue, 15 Sep 2026 08:19:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460408; cv=none; b=RWHPgRxzAIdJAF8aT8UmEtVzCFoBTuGM4GDhsxYCc0VaYirH3LRcgxc08NlMXS/GClvDXYzDx/+VmU2zjFm+V5vAzohZZysEIqH6qqHAsbpy57zp1T5BmCbVYnxkJk/pIejyjq/GDuQ6ZwY59r4OpPjtp0A0Cl2vimog84OXYSU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460408; c=relaxed/simple; bh=aFG0xUCnVhRmh5AZ+6xtqf07JXQFbTflRFt4CKN6Is8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nBS9BNryKL9CRwn/IuTIXEM4DaA6RV7WvOr7zWwPaGrn2vim16Z4VPBIfF/GF4w8PzCRgItrSEXEGVW4dHG/ijiJhRbWgN/x1ibmBmN4O4W1+nRWKxXS6Z6Oz9k2JTaDNnfnf/GdA0/WF7mG4h8NpPlpz34swTsq2T5lB128fBk= 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=LjMJS6E4; arc=none smtp.client-ip=209.85.214.197 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="LjMJS6E4" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2d6fb956002so52098615ad.1 for ; Tue, 15 Sep 2026 01:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460392; x=1790065192; 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=e1xTXUdJBJy44H7rwXmvsQjBVl/r1YS8CWHRr4HN54c=; b=LjMJS6E47N0MZyuMYHfNfyIaxDcUwZDWgBKHnRFRdd9GfRbihImJwYpvaaFR2FeoO5 Jc9Yr50cKixjulQ05Md3u0ZMCSBRG4a87A2NcziWVkFwnsariIO6txmat3sAgMcGyRvT i38yMtnPWXpG6cxx2LzMSCiCvaQzBoX0o4uQZumZjTaDXktlJ7wsW6N+yvwvRNef7Rz5 zIJzi8/Tv6LNjgko6yZbp3u9mM26U8+ovuxNj3zTKM7MfR67EcU1VzD2aVoAHHsmS5/r 3uxP+5dUk1Bw4RGOutMyKALYaqjB1pnVlNndyhLJ4KgAyTRIwmgZcONltt+X+GPHCzcp p64w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460392; x=1790065192; 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=e1xTXUdJBJy44H7rwXmvsQjBVl/r1YS8CWHRr4HN54c=; b=O+PPqO8q4Jjvb9jhsImDEtB90twi1N6ATQ5An9FREfkkgBk4fqDkmpW1Nba/L5WvNO oWIfOBlx0R6galdyKUQekgPoCua4SEuVa6yRFqSB3Y0Ymb8BZ64rXO5QrhHj3El11EVq P7xnpUQd7WioMT/3PS1wTmTbEFNlwEK3vZ3JEUTAfkI7SFJKd0WmRLqACqPoYOuVl//A S1r0JUjVHHwXOVi/RcmtKbirNu2akVtukfb+YRbMsrADeamANR5iShRnJuw8qvHKNE6q skBBA5gPfSAdUwhXrMu9yuzb3pX6D5amdNzSN/T6v6FGJHb0aElFUaG+DHsf7m3W/XIC 4hNw== X-Gm-Message-State: AFuF++mcbrt8Q+xgoS6lflBX5JebpPTbPp5AE6Qb5QpWLk4v1WUs04A7 qYtkNgBKrUviG+0Z4VQ2ScEIyyd1SnK1Qgp9btSelh0JcJXaf11B5vBoKOU6Qm5prUoHmJNAoSh noVxsk/p67s2NFIykD1WV5ATLjnQfMRsTG+LIX4WHtDhmnveyJbdIBsm2kbw2iEIBElh3cn5kMA 5liC2aDD3rHsPBa1Jz+EnUFhyvkgdYyqZyHm9zOA== X-Received: from plty2.prod.google.com ([2002:a17:902:8642:b0:2d8:da84:22a9]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:b8e:b0:2d8:d4d3:3fbb with SMTP id d9443c01a7336-2dd6c73445amr126364165ad.15.1789460391377; Tue, 15 Sep 2026 01:19:51 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:20 +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-4-morbo@google.com> Subject: [PATCH 03/28] ARM: atags: Replace strlcat() with snprintf() for cmdline extend 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When CONFIG_CMDLINE_EXTEND is enabled, parse_tag_cmdline() uses two strlcat() calls to append a space and the bootloader tag command line to default_command_line. In preparation for removing the deprecated strlcat() API[1], compute the length of default_command_line once and append the space and tag command line in a single snprintf() call. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: developer:gpt-4o [editor_update_file, shell_command_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/arm/kernel/atags_parse.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c index 4ec591bde3df..21140b44d96e 100644 --- a/arch/arm/kernel/atags_parse.c +++ b/arch/arm/kernel/atags_parse.c @@ -121,9 +121,10 @@ __tagtable(ATAG_REVISION, parse_tag_revision); static int __init parse_tag_cmdline(const struct tag *tag) { #if defined(CONFIG_CMDLINE_EXTEND) - strlcat(default_command_line, " ", COMMAND_LINE_SIZE); - strlcat(default_command_line, tag->u.cmdline.cmdline, - COMMAND_LINE_SIZE); + size_t len =3D strlen(default_command_line); + + snprintf(default_command_line + len, COMMAND_LINE_SIZE - len, + " %s", tag->u.cmdline.cmdline); #elif defined(CONFIG_CMDLINE_FORCE) pr_warn("Ignoring tag cmdline (using the default kernel command line)\n"); #else --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 7C9E444682E for ; Tue, 15 Sep 2026 08:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460462; cv=none; b=N/D2zsOgRPBuYI7duF7DdDpb0ErdxG4OPQTWgW510qA+lPZprPaDmwlKPebnkkRHEp//E0HukqnsHKn+9rWfDxICNhcC4mefRvOCy4cbLNBjCdhuThw24Y5qK5LrBdldeAS15M8MIAV1AYTnUpgRcKOmj4teji1y/fSc+v6Ca14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460462; c=relaxed/simple; bh=ssrtilV0ROe6MoyNp1rJsvlSxakRJHyBYRIufpPLFUQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=X0k1oqRxjmIUSHuHgTKeKJIgyxbkDsdu7jRCQc0XmUt3X7edz9mC8KaDRzhFRyohCsjmj/iRn5p8n9yGFy23Qfq18DEJhl9OuFOKg8B2Xv8rbx8rBXfuqwEGOS8yu7wJX5NfKjGuyPtdtHF2GVOcHHedcdQOBzSDOW2Z3ZWExPE= 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=Xihxa3OH; arc=none smtp.client-ip=209.85.214.199 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="Xihxa3OH" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2d55d8cd938so73486615ad.1 for ; Tue, 15 Sep 2026 01:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460393; x=1790065193; 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=zWD4hm0/QtNssxCPHbfwVqSd2Rh5fwz1bRTM/8vetN0=; b=Xihxa3OH/mCSCECGGr6/9fEt1Zqumko+zbQG5KqiHGv9OMJPrmtBtY53X70e5DXa5N /Mvht2Bbrf6oWaRG/Zvd07FCQdV7WtzqYiSWNhCLMAtPFyNG4+/RPy7ukiB5Fk++dm+e nNlrbTf1QbI8hEuN5W+70U5+b2wvnUsSGClR/TcfxJ1pIHXioYU110PN9I++hjsKuRHN wRpCoEqOKptIA+fGlsRhSafmeLWbLfuTuLa5H3Fm/eWfwPx2PIXZz31GMPSFQAnKFC+r fkenlqAnef01TCn9A34WFUA9CD4Y2fvptoQFdOXHHbQYHtWpR2IroCvW9/fUlZvI/Lv+ b/rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460393; x=1790065193; 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=zWD4hm0/QtNssxCPHbfwVqSd2Rh5fwz1bRTM/8vetN0=; b=z6+vwvSFH445oD7QXmrTgAJuowjJJ6+jOsYrNv0MZU4XoF8KOpzMnbCDYmUsUASJmV dzBlM7XcbIRdXG3bjBxN+r0DuHNQgLvyJcHxP5+1y9KO0cBcL1+PTGt5S4rOn0irm9Ob d4yN0XXuObE0leUXC1sOxq9yPMOu6rTDW9w12AlzSJFmug47gWcrWJcAk9ZNiIqh9LRm nE3WKhDET2hbgl5MNCJpLjkZHSGgEGwBnAQ+wAbDGex/ryOJy8geGjzrNPfFy9MkY3cW iJPsICk0b/Qzj30Qf7qJKLuTAO+/KiPwBd9mQq+gLMMCMuRmF3uJ4M1VWwnbM5Jr2bYL 8btQ== X-Gm-Message-State: AFuF++mQWW2IXyCYT3zoEKjtPAs6Zo1BGx7KGLZV5YJHD5AexHQOBNES Dw8Hc2reV5/VOKAfSki/WYrHW5SLA/eGYOLCbWD0UTtDH+eWmQfk8XkZ/3g8wdI3tkIKal66OIS O0rm7lK8pv/pHuDYCYsw2M/U97w6cNu1TnCGbitxV88tew1UGr/ek3tGOBvCuqB2BoKIFesgM97 /1GSbH5lAm1/I12Fl+QOWB6toL39zXbmSi/0dPhQ== X-Received: from plot14.prod.google.com ([2002:a17:902:8c8e:b0:2dd:4712:5539]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f541:b0:2dd:1701:3b6e with SMTP id d9443c01a7336-2dd6c73381dmr119309875ad.16.1789460392218; Tue, 15 Sep 2026 01:19:52 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:21 +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-5-morbo@google.com> Subject: [PATCH 04/28] scsi: bfa: Use snprintf() in bfa_fcs_fabric_nsymb_init() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bfa_fcs_fabric_nsymb_init() constructs the node symbolic name using strscpy() followed by five strlcat() calls and explicit NUL-termination. In preparation for removing the deprecated strlcat() API[1], replace the chained string copies with a single snprintf() call. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini-2.5-Pro:2.5 [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 --- drivers/scsi/bfa/bfa_fcs.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c index 9b57312f43f5..7a4e0e8c7182 100644 --- a/drivers/scsi/bfa/bfa_fcs.c +++ b/drivers/scsi/bfa/bfa_fcs.c @@ -821,30 +821,13 @@ bfa_fcs_fabric_nsymb_init(struct bfa_fcs_fabric_s *fa= bric) =20 bfa_ioc_get_adapter_model(&fabric->fcs->bfa->ioc, model); =20 - /* Model name/number */ - strscpy(port_cfg->node_sym_name.symname, model, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->node_sym_name.symname, - BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - - /* Driver Version */ - strlcat(port_cfg->node_sym_name.symname, (char *)driver_info->version, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->node_sym_name.symname, - BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - - /* Host machine name */ - strlcat(port_cfg->node_sym_name.symname, - driver_info->host_machine_name, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->node_sym_name.symname, - BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - - /* null terminate */ - port_cfg->node_sym_name.symname[BFA_SYMNAME_MAXLEN - 1] =3D 0; + /* Model name/number, Driver Version, Host machine name */ + snprintf(port_cfg->node_sym_name.symname, BFA_SYMNAME_MAXLEN, + "%s" BFA_FCS_PORT_SYMBNAME_SEPARATOR + "%s" BFA_FCS_PORT_SYMBNAME_SEPARATOR + "%s" BFA_FCS_PORT_SYMBNAME_SEPARATOR, + model, (char *)driver_info->version, + driver_info->host_machine_name); } =20 /* --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (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 626F943F4AB for ; Tue, 15 Sep 2026 08:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460434; cv=none; b=W8K+kJKndSDl+dnEEzMw+ZoAmlgQGodEfvTkT5LeZ1yeaXl0fb985NHe02/xWyZmZtHw/nwhdBzqc5htUDYtVQKNHB1L+NGb7J2lXJA8wtaykzdA4bvT15p0sOjykiwhmQcahGDOQdPPNlEHZdlHKnLeVYOOtT2iaa6YDfb4bO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460434; c=relaxed/simple; bh=r5g1LIk48i14U2vfSIgapr+8j4d1ay+VHM72YHjOSgk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jUzz+Ec4yG7h5+fXGaDX3hpYBv2czhU5wO7Uf76pj5ijnuXMfrrqjHwjoZL2GTRC7IKcnfKj3Av+Yh7TyMpgJ8c5CGhXchoq1JoAPMe6/vI/K++UjvQ3UyD9OeRX1qbc6C9KufYxWQra7eHhQNx0GgEInyPXtlNsKwALRNUIvlU= 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=pfCMhHC9; arc=none smtp.client-ip=209.85.215.197 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="pfCMhHC9" Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-cc42a07d04aso3561895a12.1 for ; Tue, 15 Sep 2026 01:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460395; x=1790065195; 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=eIty82Ymjj64Fl6mn4Z3/QHhmY1e0QRFUR4BQSE5AwY=; b=pfCMhHC9ejy5QWj6kEG4G7FJpoBqoyNuGsvpYI8mV/Km8alBeuaIcq7YeCx1pVa6uF NWlfblw+NmK5zx1DpdIZcbMD9JioKHsEhAmmbf5HeLvFA1Qc6oNJiFo/Cl8zlQO3Jz1e qCNHr2VlFDViUE26nXLoY1ufbWe8Pbs4tR7Y1DHCdqW967sN+LMZxF7ADxAsxRa0xFUZ wCdKL6pe/sa5k+UvnYCstigVumTisjy6p4/OB3Uz/0GnLC7z4D9TBtorJq1qftlnfcWd RwUlljsJOpKAoFL4yxkwvpNra0QuK75AgFKhmMIXWuNN2TnyvSmurNW0VG4Zgu/TWYYL xTyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460395; x=1790065195; 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=eIty82Ymjj64Fl6mn4Z3/QHhmY1e0QRFUR4BQSE5AwY=; b=zpPW1qcA956RaRJptueBLWG4hGcJAt/DygK+YzBDz9LKZbWeSvkRAnog6Nh9gUkseu /FE22baHiPQ6qPTESzPWupxSAlX42dp+nuMRCXv983OkRDxcYIDXUiTNTTOkTeinMQ1b IJtsWB2HicMmkNGrrlvwAR7UVargIEZAxR02bpHTHP37IGsfZ/OtYAvTnb3xYDd2Bykd +qP5mKFzWsbazfv6H8RYwR2kF+qHo/PoSHwldPVZu5fGP719Eb9NGB1gxdn+L2RMHimj Lov4WyzdGfl44tdbuCjJ9KjpJFvw5EgYuN21VhioRUDymGFuwgVrxG291xUo6HYly3m7 pRmg== X-Gm-Message-State: AFuF++m/fH8U/8TRFXAVFUR++OrVwBiEN0XZJdvjJ4A1nwrDhs8orTEs 9IIjAe780TZIlHI5d6JwdBnKo2OoCHaVy4PzpPyZ455+C5VY+llIj8htn1gBPUZYGBn75APDU8p 2XUF2e0F5iak52uQcoCaEzshqCwRp0IbODC/fTjdRzEHvnx9kosONQKeeDauY6ODFkQdLFeL4Gm fa0LiTQ1hA07Wys0sEDS22QqvYmjcgLSSsP4e6tw== X-Received: from pghd13.prod.google.com ([2002:a63:fd0d:0:b0:cc4:37f6:e897]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:12c7:b0:3d3:ae1f:d7f4 with SMTP id adf61e73a8af0-3dd528bd7dbmr272615637.20.1789460393063; Tue, 15 Sep 2026 01:19:53 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:22 +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-6-morbo@google.com> Subject: [PATCH 05/28] ALSA: usb-audio: Refactor usb_audio_make_longname() to use seq_buf 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" usb_audio_make_longname() builds card->longname incrementally from the vendor/manufacturer name, shortname, USB device path, and USB speed using strscpy(), strlcat(), and manual buffer offset calculations for usb_make_path(). In preparation for removing the deprecated strlcat() API[1], refactor usb_audio_make_longname() to use struct seq_buf to track the buffer position and remaining space across these operations. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini:3.5-pro [git, make, checkpatch] 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 --- sound/usb/card.c | 58 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 9307da95efbe..bdca8085fca6 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -651,7 +652,9 @@ static void usb_audio_make_longname(struct usb_device *= dev, struct snd_card *card =3D chip->card; const struct usb_audio_device_name *preset; const char *s =3D NULL; - int len; + struct seq_buf sb; + char *buf; + size_t size; =20 preset =3D lookup_device_name(chip->usb_id); =20 @@ -667,44 +670,61 @@ static void usb_audio_make_longname(struct usb_device= *dev, s =3D preset->vendor_name; else if (quirk && quirk->vendor_name) s =3D quirk->vendor_name; - *card->longname =3D 0; - if (s && *s) - strscpy(card->longname, s); - else if (dev->manufacturer && *dev->manufacturer) - strscpy(card->longname, dev->manufacturer); =20 - if (*card->longname) { - strim(card->longname); - if (*card->longname) - strlcat(card->longname, " ", sizeof(card->longname)); + seq_buf_init(&sb, card->longname, sizeof(card->longname)); + + if (s && *s) + seq_buf_puts(&sb, s); + else if (dev->manufacturer && *dev->manufacturer) + seq_buf_puts(&sb, dev->manufacturer); + + if (seq_buf_used(&sb)) { + char *trimmed; + + seq_buf_str(&sb); + trimmed =3D strim(card->longname); + if (trimmed !=3D card->longname) + memmove(card->longname, trimmed, strlen(trimmed) + 1); + sb.len =3D strlen(card->longname); + if (sb.len) + seq_buf_putc(&sb, ' '); } =20 - strlcat(card->longname, card->shortname, sizeof(card->longname)); + seq_buf_puts(&sb, card->shortname); =20 - len =3D strlcat(card->longname, " at ", sizeof(card->longname)); + seq_buf_puts(&sb, " at "); =20 - if (len < sizeof(card->longname)) - usb_make_path(dev, card->longname + len, sizeof(card->longname) - len); + size =3D seq_buf_get_buf(&sb, &buf); + if (size > 0) { + int path_len =3D usb_make_path(dev, buf, size); + + if (path_len >=3D 0) + seq_buf_commit(&sb, path_len); + else + seq_buf_set_overflow(&sb); + } =20 switch (snd_usb_get_speed(dev)) { case USB_SPEED_LOW: - strlcat(card->longname, ", low speed", sizeof(card->longname)); + seq_buf_puts(&sb, ", low speed"); break; case USB_SPEED_FULL: - strlcat(card->longname, ", full speed", sizeof(card->longname)); + seq_buf_puts(&sb, ", full speed"); break; case USB_SPEED_HIGH: - strlcat(card->longname, ", high speed", sizeof(card->longname)); + seq_buf_puts(&sb, ", high speed"); break; case USB_SPEED_SUPER: - strlcat(card->longname, ", super speed", sizeof(card->longname)); + seq_buf_puts(&sb, ", super speed"); break; case USB_SPEED_SUPER_PLUS: - strlcat(card->longname, ", super speed plus", sizeof(card->longname)); + seq_buf_puts(&sb, ", super speed plus"); break; default: break; } + + seq_buf_str(&sb); } =20 static void snd_usb_init_quirk_flags(int idx, struct snd_usb_audio *chip) --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (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 8003E44AB6C for ; Tue, 15 Sep 2026 08:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460435; cv=none; b=jkHWEwjzFgs/JC73IpQ3sDi2VGLEhUK/T7nj+DdW0+W1xyCHtW207zOyoE8Oe7AEWp5wzwOzHdMSy9xnBfPmsBUSlwdWJyF6CUM/pmbATzqf02rdWjzD3B7poL9boIaZ84xVMtHB27cnBizbfJ9VkizCGJY/E1OL8Q4WyH/Uqcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460435; c=relaxed/simple; bh=NfZ3UTUNDbDjVdxNaJ9EQv1Rzk566CEKZbIH1K+eaM8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JufqpIn/NN/u51Q6fYsG0Dik3+anEZPkLoHolzQ/k1oGMPG9ERmG9xmmLOh50md176HXPYeuq99GqsCo/WdH76vt7qbDMVvoJEdRsp0X6uhkpUpgw7inCCLT5t3AuTf/TSHqfxUocYtFD4D5KHHuqOZrazg47Qh3Ecjd4BW/yOc= 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=LJSA2of3; arc=none smtp.client-ip=209.85.215.200 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="LJSA2of3" Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cc4e496e5c3so1865650a12.0 for ; Tue, 15 Sep 2026 01:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460394; x=1790065194; 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=fp8wJxWuumatGVjI+YCt9Q6O6hUP8tXGtI5nMGsUbio=; b=LJSA2of3W8P6+BjUV7LwgYXsac3nhvfffLX0uzCdrZluKDCqjXp1K6p2EcaZJWjx/r p7MKXClnpW3/vqLPzq/LsbDTlG52UR6g+Pkbt2trNgt6AKOCTrOaydEDHsRlTWgwmCtC g4PlYKVGyIcqkHgEGFCBmDscXK/7iHIUpWENlhgSJajsyuA02I+zHVX2U6amJMaUuxYz zGWelncx6qbI+rTAn6tGSsG0EvLSfQDAIKxsu5L0jDz5mk2MaI1Khf16SCRgE0Zm2d5T 3tZls0Nl+SI6YP1eQcVEWWnFCUb/ZoWesXQLqE9PU5TJr5wjKC7HD3VPlQtPv7CIKgaF euMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460394; x=1790065194; 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=fp8wJxWuumatGVjI+YCt9Q6O6hUP8tXGtI5nMGsUbio=; b=ZC2oVDoSsFvSIbB69hwGqIsxT+fojnQtGv53Bn9excjsifPVUsdPWSyVQScSt2FozA f0VkrSkye8Lh2UYpsP9TRWuC8C1WWsjsE4E8mpaQdemIg7Hs6JW7jLO9OraMM4C9C+52 A69kMEqd1D1G36dE8wZ27sqE9gWFp3YRiiqRwAC1Ep1BECwJwJoyOvTv4I12f0uip38O g6QHcOyfO1MaK/o+8RGxqVfPWJkdQVMlCTOrjgI/qKqXkEQ3lJnwx/fKkQDjxJ34j7To ZuIFa3TzPt3kwwWphxjlfySkwh/cJCDiQ2I7FoQYzggDcDitDa3d6txD3b1HTGKDEFRk gtmw== X-Gm-Message-State: AFuF++mdjvqdMCkscGVtGBGrAO0H1Z129DLvaPqfjHeYBVrB7+wrclw3 MAmNTwGIJyEb8mY/2MqHnwj3VPqWA8ayJi96/GQWFi/h/0K+DHsqQ1GLicPVKqPyAE/nhoiI/Ch 1ri0/0jYmPHq4Ltw2PkhgL0s/5J8TolPnSTl8P6qahwq1yuHo3Vl2kmX1mktHY8qs0sonDdq/2Z mjbXQB5dxiWexNjjFJmoN0JkBh89L8UQTaF9D43A== X-Received: from plbkw15.prod.google.com ([2002:a17:902:f90f:b0:2db:5cac:a627]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ffd0:b0:2bf:27b2:4b80 with SMTP id d9443c01a7336-2dd8384ce53mr639785ad.14.1789460393875; Tue, 15 Sep 2026 01:19:53 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:23 +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-7-morbo@google.com> Subject: [PATCH 06/28] comedi: comedi_bond: Refactor strlcat() to seq_buf in do_dev_config() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" do_dev_config() builds a space-separated list of bonded devices in devpriv->name by formatting each "minor:subdev " pair into a temporary stack buffer with snprintf() and appending it with strlcat() in a loop. In preparation for removing the deprecated strlcat() API[1], use struct seq_buf and seq_buf_printf() to format each entry directly into devpriv->name. This avoids repeated rescanning of devpriv->name and eliminates the temporary buffer. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: SecurityEngineerAgent:Gemini2.5 [editor_update_file, make_kern= el_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 --- drivers/comedi/drivers/comedi_bond.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/comedi/drivers/comedi_bond.c b/drivers/comedi/drivers/= comedi_bond.c index 8e10ecab4f0d..a10cfbd04c72 100644 --- a/drivers/comedi/drivers/comedi_bond.c +++ b/drivers/comedi/drivers/comedi_bond.c @@ -39,6 +39,7 @@ =20 #include #include +#include #include #include #include @@ -170,10 +171,11 @@ static int do_dev_config(struct comedi_device *dev, s= truct comedi_devconfig *it) { struct comedi_bond_private *devpriv =3D dev->private; DECLARE_BITMAP(devs_opened, COMEDI_NUM_BOARD_MINORS); + struct seq_buf s; int i; =20 memset(&devs_opened, 0, sizeof(devs_opened)); - devpriv->name[0] =3D 0; + seq_buf_init(&s, devpriv->name, sizeof(devpriv->name)); /* * Loop through all comedi devices specified on the command-line, * building our device list. @@ -250,15 +252,9 @@ static int do_dev_config(struct comedi_device *dev, st= ruct comedi_devconfig *it) } devpriv->devs =3D devs; devpriv->devs[devpriv->ndevs++] =3D bdev; - { - /* Append dev:subdev to devpriv->name */ - char buf[20]; =20 - snprintf(buf, sizeof(buf), "%u:%u ", - bdev->minor, bdev->subdev); - strlcat(devpriv->name, buf, - sizeof(devpriv->name)); - } + /* Append dev:subdev to devpriv->name */ + seq_buf_printf(&s, "%u:%u ", bdev->minor, bdev->subdev); } } =20 @@ -267,6 +263,8 @@ static int do_dev_config(struct comedi_device *dev, str= uct comedi_devconfig *it) return -EINVAL; } =20 + seq_buf_str(&s); + return 0; } =20 --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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 AC5F73DDAE1 for ; Tue, 15 Sep 2026 08:19:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460412; cv=none; b=dRHc22HJzRN5gDLp5pWrNw9/ORB8DS/7IdNelugR9gMOYdGmWdMqWG303dVxU0jfQxxRtngY9iaMpl7ViArerwODMo6/5C8oSogC/X+9VLWB5O8LziikVAXsT1jcA5vZKERrxL0w6OgqsxjhnTPASuZTPn4qlaF7160ed8gr3oE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460412; c=relaxed/simple; bh=D5RtdOVahxUZp/En82QAbknell8b9lspfIIgPFRsPMo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BYjZwW3v0RhpsIySrMCOuXlYYQwsMbo9VCncnsbT5XPoMmD4c3tKXRHJyb6vyG5VkihRxcKvsSOp1AJbPPBgMc14app4PfIcflvGSxLWDLKPPjMuJr0nklqpxZNsspd58C6K6he2JkaQ4PM+rrQ36VUCw/kqqktFriZzK1n9xQw= 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=RdRiiyh9; arc=none smtp.client-ip=209.85.214.200 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="RdRiiyh9" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2ce7dfd33ffso55349885ad.0 for ; Tue, 15 Sep 2026 01:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460395; x=1790065195; 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=GmOofVahuDrknmhehkkjM5BCV+g3cc9ELbAHUqasD2M=; b=RdRiiyh9ZlV7ht4/LU5So1Sr6lzxFo9gNto5+ostevzXONqCmJBWBwE4EswY5Gsc/G Q9uSlj6PgHyn6qJLBNRtZtc1IUl1g5LR+Q0RwLFc5elBeVq8yPyOvyGSHjCieqVM5Pd/ ISVYT6qPNZEwBsknhSBvArZ1s3yRBEP7EKdu8LxoSKOCqG1ZE7ev8rrKkVf0+BW/f9Ol fjjrtyPvxqOEFPVeXNDOZsr0vLG+7jDNb2F7EcGlTBAe0WypnzSVYlKHSKClbQGGD7sc KTWIP2cUW8H+691gA/26ixdwIIT0dpst3r4ZUX4u3ChT+RpFov8L9cNBPBubgGxEcja6 KzTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460395; x=1790065195; 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=GmOofVahuDrknmhehkkjM5BCV+g3cc9ELbAHUqasD2M=; b=n/cHLTLYwRYdTEH8h53tI5bGmIYrUWcVtjTtSG/iQKuV9KLbrU0FE3rFS14SM7aWD+ ocbzsZP/KkgRNgc4Vw2Zq3lComGoL1wRHyA2kpT3qtsJ7XQZYl+lKP5aY5m0OTjKmItU GBt9/svzH3+djxYE8qv4pqRMx1np8UtKnfF2SuEzvVpmXfxAP959icO6jMkzN74DMtKS zcB64if6HaF5GNg0ut7XDgCXgCdRjtFt8FzEo45n/tptxnAkIvxlRgykVHqSGO98Z6JM ka5Re//CySYi6U5GWQpzEQUXU0OU/8hU171bBgNufmzUIOIEiYEcnNHpBXUFD82gBMRf MF8w== X-Gm-Message-State: AFuF++ksIlDohc2J+6lYYkDNTvQU/vlD6jFJ6L93lqlIT8cXWVB56Ss7 seVb6l0c+vXbC8LrtS8VUa7puVeqMvZEjSqy97AObwWYGbHi2JU9aFS7sNlgoDZjwphikYDqAVG sLXwfcEgfgyTAl+tdbdiZzVJOpL0v81E9Y2Yzw+BGuyOkYRj0MnSTouu+LV9HcNPZCm/ZBRvEX8 URrA5zeW/OLq3a8XKYFFbj7SzfIiSF9lMMh27T5Q== X-Received: from plrq10.prod.google.com ([2002:a17:902:b10a:b0:2dc:ff56:3f4c]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:db0e:b0:2d9:520c:38e7 with SMTP id d9443c01a7336-2dd6c5c1330mr107218395ad.1.1789460394736; Tue, 15 Sep 2026 01:19:54 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:24 +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-8-morbo@google.com> Subject: [PATCH 07/28] scsi: bfa: Use snprintf() in bfa_fcs_fabric_psymb_init() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to bfa_fcs_fabric_nsymb_init(), bfa_fcs_fabric_psymb_init() builds the port symbolic name using strscpy() and a chain of seven or eight strlcat() calls. In preparation for removing the deprecated strlcat() API[1], replace the chained strscpy() and strlcat() calls with a single snprintf() call. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini-3.5-Pro:20241215 [editor_update_file, make_kernel_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 --- drivers/scsi/bfa/bfa_fcs.c | 49 ++++++++++---------------------------- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c index 7a4e0e8c7182..9fe0343c0b32 100644 --- a/drivers/scsi/bfa/bfa_fcs.c +++ b/drivers/scsi/bfa/bfa_fcs.c @@ -760,49 +760,26 @@ bfa_fcs_fabric_psymb_init(struct bfa_fcs_fabric_s *fa= bric) =20 bfa_ioc_get_adapter_model(&fabric->fcs->bfa->ioc, model); =20 - /* Model name/number */ - strscpy(port_cfg->sym_name.symname, model, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->sym_name.symname, BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - - /* Driver Version */ - strlcat(port_cfg->sym_name.symname, driver_info->version, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->sym_name.symname, BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - - /* Host machine name */ - strlcat(port_cfg->sym_name.symname, - driver_info->host_machine_name, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->sym_name.symname, BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - /* * Host OS Info : * If OS Patch Info is not there, do not truncate any bytes from the * OS name string and instead copy the entire OS info string (64 bytes). */ if (driver_info->host_os_patch[0] =3D=3D '\0') { - strlcat(port_cfg->sym_name.symname, - driver_info->host_os_name, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->sym_name.symname, - BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); + snprintf(port_cfg->sym_name.symname, BFA_SYMNAME_MAXLEN, + "%s%s%s%s%s%s%s%s", + model, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->version, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->host_machine_name, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->host_os_name, BFA_FCS_PORT_SYMBNAME_SEPARATOR); } else { - strlcat(port_cfg->sym_name.symname, - driver_info->host_os_name, - BFA_SYMNAME_MAXLEN); - strlcat(port_cfg->sym_name.symname, - BFA_FCS_PORT_SYMBNAME_SEPARATOR, - BFA_SYMNAME_MAXLEN); - - /* Append host OS Patch Info */ - strlcat(port_cfg->sym_name.symname, - driver_info->host_os_patch, - BFA_SYMNAME_MAXLEN); + snprintf(port_cfg->sym_name.symname, BFA_SYMNAME_MAXLEN, + "%s%s%s%s%s%s%s%s%s", + model, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->version, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->host_machine_name, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->host_os_name, BFA_FCS_PORT_SYMBNAME_SEPARATOR, + driver_info->host_os_patch); } =20 /* null terminate */ --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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 AA50139DBCF for ; Tue, 15 Sep 2026 08:19:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460408; cv=none; b=WBx7AfHhFzdMT4BZa/pj+F3mAJqozP9jlEgkLKLAK1XCniILTIBC9aMWgyOOpr0meDtgXfnmh6UGMt+iDdcil/OoK1y+Jzd/462109euLxhVqLwHLEOO4oB65cRgEGzaUhLShCXESgUzYNf9iP4qOdccMv+GdxQIbxpa6dvuWYM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460408; c=relaxed/simple; bh=IWKQ4COf9lXb2aWQAfm5Y+7WKwIMngPQWy99kbv9mag=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bnnSBtGNWgZQ5v7N+6kmKQTt9F3ZYTgrX1wykP756R8zpmWVU5qZaZzrrdLC2vn27274/rOSJDdpj3cLwiFZeAyeVZNUeHE0DrDBphjW2l2O3yBWMvVTCwviaKgMdBuFZlk+dZpX2rL4Jd/hi3YIIuElq6rRsdlRy9Cuysafpl0= 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=NLwjmdHq; arc=none smtp.client-ip=209.85.214.200 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="NLwjmdHq" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2d54187d8b0so89993205ad.0 for ; Tue, 15 Sep 2026 01:19:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460396; x=1790065196; 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=su2v7itwh4re1nYnX3JAIlBIidMghtZfDu1F4zgeEKU=; b=NLwjmdHqXhHTwQZmVKgCrm0egfEdFt4+kqHUbEwGSwa7+jCHrtxRqCU44FOPWPAw6j Lu79gJPVjqMJlIYOJ/wc0kJOGdayaE/KR0Z9gxoOi3VugE7Ipx0O9iLfLkyAWlCYq7Ip LkeA8eyt49nvLNOa8UOlG4Lbs97dmAap7rYlJqxP9gi2UeZNV2NohyphAr1487ngCVTC PlZGh8QwyTQYe6hHZ24kzQuJQzvL3GOWl+ioAxwsCLovzu+vRJGwKx9/2FVvpe5ZUYvy fFnqJDwyzJhdXOOGSTTKhDv8UVsgclHT8RulI0mE4BvFZ2c5mUT6cbkiDvHtmt43btcZ KGGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460396; x=1790065196; 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=su2v7itwh4re1nYnX3JAIlBIidMghtZfDu1F4zgeEKU=; b=uY5dYAHMr145rqHJlQ9u5Kp4otSU3Ch8JsP8sdYrMkYI7eL2/AZmO1Nyq+UkLb7WPP vGDinLj/yF3LMiED1WGRoMw0jXwMNYW3hEEr8k/ed6gf9CLSLysz/QCoeUjY23Ma6+iX da1FA3vsuNWcb1VSvejBDptR1q0qHFH0ZmtPUNt+K6h6j+V/gNPqAe5xuNXaMnSS/57u WB3jmI/Re2Vi2MMXnqnpSfsqYWysPwOFsAg8UrnHUCE3jh3etOeO3W6Ecu7UIqR33vXU 1clNHLlDNB1vV7g6BcGQTAb9W4B+DK73lVkDy45nLyT8JdQ17EWPoXYRx6VoO9j/JXMQ 3PFw== X-Gm-Message-State: AFuF++moxZeQLI6kU03GPaQtk7mxCdLqFe8D7Y/BZpJgxYFJ+ZbAklWA jcJNClso5njL1+P6NtoA2M4CofvxZlfvofnOJreKHBZTk/u5HTr/hx7v4Ws+UHPByvUVTn2rEag 1yRwspKlhZGqpd+XYSqDalAg0qfpwR4LbBRYBtGjd0dyd/mla8b7StALpdTRkZ+ncHQKadWEK+5 UyDruwWCHL8d8W0OtFQZD9jdbJP3hH+FLU/E4gRg== X-Received: from plpo14.prod.google.com ([2002:a17:903:3e0e:b0:2cc:e407:8fef]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3508:b0:2dd:8b2:6e64 with SMTP id d9443c01a7336-2dd83851cd5mr695675ad.12.1789460395589; Tue, 15 Sep 2026 01:19:55 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:25 +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-9-morbo@google.com> Subject: [PATCH 08/28] devlink: Refactor strlcat() to seq_buf in __devlink_compat_running_version() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" __devlink_compat_running_version() appends running firmware version strings and spaces to "buf" inside nested netlink attribute loops using strlcat(), rescanning "buf" on every iteration. In preparation for removing the deprecated strlcat() API[1], use struct seq_buf anchored at the current length of "buf" and append each version entry with seq_buf_printf(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:v1 [editor_update_file, shell_command_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 --- net/devlink/dev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/devlink/dev.c b/net/devlink/dev.c index 55959b0ff5ab..987b071345c4 100644 --- a/net/devlink/dev.c +++ b/net/devlink/dev.c @@ -5,6 +5,7 @@ */ =20 #include +#include #include #include #include "devl_internal.h" @@ -1190,6 +1191,7 @@ static void __devlink_compat_running_version(struct d= evlink *devlink, { struct devlink_info_req req =3D {}; const struct nlattr *nlattr; + struct seq_buf s; struct sk_buff *msg; int rem, err; =20 @@ -1202,6 +1204,9 @@ static void __devlink_compat_running_version(struct d= evlink *devlink, if (err) goto free_msg; =20 + seq_buf_init(&s, buf, len); + s.len =3D strnlen(buf, len); + nla_for_each_attr_type(nlattr, DEVLINK_ATTR_INFO_VERSION_RUNNING, (void *)msg->data, msg->len, rem) { const struct nlattr *kv; @@ -1209,8 +1214,7 @@ static void __devlink_compat_running_version(struct d= evlink *devlink, =20 nla_for_each_nested_type(kv, DEVLINK_ATTR_INFO_VERSION_VALUE, nlattr, rem_kv) { - strlcat(buf, nla_data(kv), len); - strlcat(buf, " ", len); + seq_buf_printf(&s, "%s ", (const char *)nla_data(kv)); } } free_msg: --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 B7728435508 for ; Tue, 15 Sep 2026 08:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460423; cv=none; b=gOJU550Oh9nPAeny2O9DFPl1VUsMOTFT9RdVTSzQ2zRNdunC6sfOPiL0i77XQkTzTPw272oNpd2HsZsCCOMRZ1iITBvdQfrQgEp8sD7SqwPcmSVCTyeKJ7TZeOHCr7HkPomlAFnCr+KKCLEHgmkmWYf4yvyztOl0lw9FigRU88M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460423; c=relaxed/simple; bh=fYjlaDLOkIa3QdHbKJ4O6Lm/D5DFc2RNPQfGa04DsYY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uWY/flsrclNITzKV2k3faMR8NdI23hQMWBX639WBuU92xXxHSYRmHnBOcrXnmytvxe1qxZduYCXyi8nIUFTjWNTbiI1QZAbK8RAMWAmfFT4chAnqIiQtcz68g3WrfhUR7YT9wEpI4WJ02Y9myQAHXGpq9dTdrW1F38+WFP/HiqA= 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=UJpCNERr; arc=none smtp.client-ip=209.85.214.198 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="UJpCNERr" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2d001671a54so82263725ad.2 for ; Tue, 15 Sep 2026 01:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460397; x=1790065197; 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=GTPji740I5eKt5N5xuOCbc+sv4InPenFdSBTJb2/BeU=; b=UJpCNERrdzYtz4V5R09zGVKFgv+zv0zOy7N27gSuHlIy3m5Yph0CI2MPfCGXePZJd5 1ZIiVab8C8ib6MmapDEdBuQ+PwWkOFuGOddUATAM/zdGKkmmm9pZ0zs2cWp/emSLqsyv uen9wE+fVEPsweYpqcCws7mYicC1NCDhRrSdQB/BzujSlzeKEXiVx2NO/jbuMvLp3w3i LwGz2+K7GUwK0c/Vxjys9USBYvyaEe7lKZAy0ceHYwpq6pJnrum8WDP9KFpIwI8TAOYy wW5mg66ubvVyi22xMpjikyNwU/OKSLxOoKq/1cu174PqFlSea9SRer4U7FIzkUlD+uzm 1FYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460397; x=1790065197; 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=GTPji740I5eKt5N5xuOCbc+sv4InPenFdSBTJb2/BeU=; b=fKWDsYookVKyAMpFtIvY7CmkhJsdY7UZLfB+UQRW1P4wHwdx0fqSLZcoFzpDaZlZB3 1btZXoJrGvoBO5tcDLNa057aJKiO0C3dIm34+9q/ofPRUlOODBq6Q5bdsxDRlrvzvQOk SLodr6Z2wQZSObtFDAHZbBcldf7Xlatng0LN6KjJ2xGS18DkIijNX+qCFK+dl754T8yi USlf91OYDkYEqqkmRcHdU6PyFVmraZssNMr+txmn3PdUYcp+acf6sQH2cbClHSQw0KNs 63wKdMKHy7cO2CwORV6EVBj8pBVhxKu+SFp3igorumuveWhOWYGDqlt8fIQ8lHC5++kk 1CiQ== X-Gm-Message-State: AFuF++nRf0zv9jiViDavn3e9bV6mqf07vVdDP10Uh4hh/xTUBe+nJhhz DRdFknPbVX+Jcqb3S478NdKzAdX+JqF/4Br3DusX25etMGhBPOHQgzEwq1lYSY0vEKdrZRl4zF8 Firzniarcv0nzQ/eB/Svy9jvkISEXrWiz4Dl0P4yh342lbtfAbMshPJpgqkxfURrCS7Q/pU0B5K t3JlXcVxEA3svBhq7dxfHZFwVQF4lz9OSNeWVuHg== X-Received: from pltt2.prod.google.com ([2002:a17:902:d142:b0:2dd:5303:f006]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:244d:b0:2c8:248a:5dbb with SMTP id d9443c01a7336-2dd6c5eecb7mr124092305ad.7.1789460396342; Tue, 15 Sep 2026 01:19:56 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:26 +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-10-morbo@google.com> Subject: [PATCH 09/28] drm/dp_mst: Refactor build_mst_prop_path() to use seq_buf 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" build_mst_prop_path() constructs an MST property path by formatting port numbers into a temporary buffer and appending them to "proppath" with strlcat() in a loop. In preparation for removing the deprecated strlcat() API[1], use struct seq_buf and seq_buf_printf() to format the path components directly into "proppath", eliminating the temporary buffer and repeated string scans. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Claude-3-5-Sonnet:20241022 [editor_update_file, make_kernel_bu= ild_single_file] Signed-off-by: Bill Wendling Reviewed-by: Lyude Paul --- 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 --- drivers/gpu/drm/display/drm_dp_mst_topology.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/dr= m/display/drm_dp_mst_topology.c index 7ce9e212770a..229b5fec44bf 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -29,6 +29,7 @@ #include #include #include +#include #include =20 #if IS_ENABLED(CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS) @@ -2216,19 +2217,21 @@ static void build_mst_prop_path(const struct drm_dp= _mst_branch *mstb, char *proppath, size_t proppath_size) { + struct seq_buf s; int i; - char temp[8]; =20 - snprintf(proppath, proppath_size, "mst:%d", mstb->mgr->conn_base_id); + seq_buf_init(&s, proppath, proppath_size); + + seq_buf_printf(&s, "mst:%d", mstb->mgr->conn_base_id); for (i =3D 0; i < (mstb->lct - 1); i++) { int shift =3D (i % 2) ? 0 : 4; int port_num =3D (mstb->rad[i / 2] >> shift) & 0xf; =20 - snprintf(temp, sizeof(temp), "-%d", port_num); - strlcat(proppath, temp, proppath_size); + seq_buf_printf(&s, "-%d", port_num); } - snprintf(temp, sizeof(temp), "-%d", pnum); - strlcat(proppath, temp, proppath_size); + seq_buf_printf(&s, "-%d", pnum); + + seq_buf_str(&s); } =20 /** --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 BF8BA466B09 for ; Tue, 15 Sep 2026 08:20:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460436; cv=none; b=DxfVeJt1WIPMFUkM1sTZTItFkWMdTJ2039VsYLjjF5rLWDybRdCG6GsDW0HKSLSzDvqcOjAHSAKNsUeQROTqFxKaELzkCbATOtqxHfNpwCdIy0zm3c3nnrEv2I/tYSpix6Po4Uk731Vi6AhQKjRYLXGep0npxnVeie+VI4g6ImU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460436; c=relaxed/simple; bh=Hf8Hcf3/GVCrKP3bnfnvDYzjoz8pInTEuZeXHBnhpZg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Na87aeGHitUU0u53xOlvFNN1kPWF7Rq8Vhu5hmjvBalFjAKHc8PmNs7LQFNzshavCZUFqfpScarZ1dqDdxiz30RYiA89R2e6h+0kJKrFJzozm54ydC5yrAPuNnZZ4jJQSxH1YYTfNubX9ixYcJur9fD/dWpc4SPSpVjMs9lBvow= 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=L24HfS41; arc=none smtp.client-ip=209.85.214.199 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="L24HfS41" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2dc7337e2a7so52771805ad.0 for ; Tue, 15 Sep 2026 01:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460398; x=1790065198; 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=q9qHU7CDEu6zWWmniYe9q2ucwWYfoa3UieeTJM1aJto=; b=L24HfS41HHfpDQT5zlyJA0uJuEuN9xySD5geTaPiPzpaZsWIJ4ViCOTZDlYoyqjjgL JsJyZXfg3SYZcc+3emOR9lEe5dIWKzWDQqWfFgOlS0o7TPv0waMYj/kjRQmmiP+mZQYe fn+xe7WXI4uDdP8JcI6wa5TP+rEOIH/DMh5tbLIjo9cmWezCQy0zqkABLMUhnFN7BAHQ 5aBOISJpiPFomDtCWTcYjgSdJ9YsmOXAS7sTMwdy+5WpFMubBETlElDi4+ZOsZKt3zMC BuV8YWKWxAThPfTuPiRQUkx30EqzqE739kQ5vIC/+qSCni1GhpYQ9IHH6+pMTAgf6Uny y4LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460398; x=1790065198; 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=q9qHU7CDEu6zWWmniYe9q2ucwWYfoa3UieeTJM1aJto=; b=E/uOLH0PqBdht61cHJXsiL4wOS9B5pk9PZSkcgOtFJ79NOftPB2GzxPA1xrj42nWSf Kyvc4rcO55tMkdhUDgZRHUD13mVvVh3r4IfFgdYVfdVtQ6qIINilE5zfN+iEK5nYaMVS ay253WLFGR97zAuxYhnqnd0zml1saDREti4r8pckW39AR3e3hoWvexqmw1Kr7DF5D3m9 kIcbAz4Aptho9sU1dfAoKqdhLbgR09XP6CPSlDPrBHIP+zjz5JiLlBWk2Ga6Tc3TPqHX IrczhgO5lmslfN4k3LRW0drO35BrDKn0eQgEuXMu3C34ujdTbVNK5f1HuqcpaVmdMcai g6iA== X-Gm-Message-State: AFuF++lkmW25mfXHPlPnMuk9c0MF7nO5gtpfxPTbOd0CUmHSp+JxUILp JFMCglJmsQMAChyEu9gu6CHJW3VKwhXMzq470EcNr+q6Vkfgf8G0tU44CYBvJI7vJnM3dWvR8KK rPaX/sEf7Wj31Rt1tzxIPKacOvzN9DPVaqElJdcjF+akR5Q8UOtWCzg1dBm15AHzXtPvzdMVtai Y0F5+xPy1k5PrdFHz0F+tFagY9pBjI0OuCW8mL4g== X-Received: from plhc17.prod.google.com ([2002:a17:903:2351:b0:2cf:ca4d:25e3]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2408:b0:2d8:d4ce:9f32 with SMTP id d9443c01a7336-2dd83869ae3mr512075ad.16.1789460397125; Tue, 15 Sep 2026 01:19:57 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:27 +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-11-morbo@google.com> Subject: [PATCH 10/28] of/fdt: Replace strlcat() with snprintf() in early_init_dt_scan_chosen() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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 --- drivers/of/fdt.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 =3D initial_boot_params; =20 + if (!fdt) + goto handle_cmdline; + node =3D fdt_path_offset(fdt, "/chosen"); if (node < 0) node =3D 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); + { + size_t len =3D 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 --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 CAFA646983A for ; Tue, 15 Sep 2026 08:20:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460439; cv=none; b=qkw7utnhTj8m9v/Psh2ntAuFdwa1L21D/qGdxy6hPVGMOTstrkpAb4wZBEGkniYD0G/Ky9+Y0AnUHRFCEXUoJj4XTHFxevsOznZOcr1DcOrUeOae0FUoEK6SKstiS5Hue+kE11a2YtV6DpTbUPSOYJZp5JsxANjIf/jKZzwCXyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460439; c=relaxed/simple; bh=EN6EGME+huegbOxDBjKH7V67mh976lOmZoZq43U+s0w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ag9lnouzjHisXntIonh7iaux2MVjckFOykUkudgMiyRsf308SzvZz3DxZ7RynkI/qigAEQqk46o4barcEXXbHRPYDaa8bz0SlyBsZSX8ZF57r8sTmExYNxz322FHgIQT9gd/xQ0aPgcsqWVtaTJop/wpOlHxc4r07jhqnHdeJ+g= 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=vYte7tUk; arc=none smtp.client-ip=209.85.214.197 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="vYte7tUk" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2dd753a52bbso18790685ad.0 for ; Tue, 15 Sep 2026 01:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460400; x=1790065200; 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=EgFMWIs3mUJyaWhldMFLFql9frpSc6deV3MqyJ0yzUw=; b=vYte7tUkHJFWXfT6KsyX7Wr8Rrz4sjJLKKsMA7bq55v7nidy/YQw7EZPEAGiyg+rK7 sxjW/t48fE8xv/Rm5lLDaOW+jTJufQdchTkUSpiY9u/qfbfikEA8iViCTtWEajXQcLbj nxwJ8EG+2P1vnWz+y+Ay3LdxTQ67NynLhvD6yTj0pVToCiaTly4p8/wnL5z5wQd6EfuY QR1+LX8zw4MWrOgbU+6QkJYgz+508IUdzBu6nOs+Rksj8lfP9ioOSsFBReXRIQhL8UR3 OdXUtb7C7UkmHflCK7hl8Ee8+PEhvmq0MuRfNIkD9Bd7YxyymFnHlk27zb+VOOJnFZGt j+HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460400; x=1790065200; 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=EgFMWIs3mUJyaWhldMFLFql9frpSc6deV3MqyJ0yzUw=; b=mpp9fvgILrzATiwDtP2Q+MXo8QDWAE/7e00DNFdf8Wrr5uRzsNjHqHkh1eIl8HJB4C vShJYrEEouIsLaNyA8Qhfu7NOfl9Cewj2n/m4L5yp40STkP8TOipcx/RbBUV8M/fsc/2 YYomKyJhCwJbNTwoiCDAvRabXruw3AXzdxEYOvn42bV1i5yhnbh2HyYvKVKWI0VfVO3J dQVcyBWqvZ1e6G20peJrCxr3Xfy0ZP8QyBDBfm87Jtrzy98376P4g1SvVrhV2rY8Oncr CJ8czTEkbOslEyppyWrzOvRbTKwLcPE8HlEDWZFgm/edR/PrKzUV2aMmpznDQtUxgd0f WSJA== X-Gm-Message-State: AFuF++msdp0jYw0J/0ijKNPoCk+qmSdoQ10sU65W285zgnf47HwP1xMn FP7jitmAAGN8xoP9VuouVHuqco29D4YMVCVE6uO0DejrW7jjun+2IOrMq9JxXzMqjSsvx6Tg3lB W9Liq92ks+frGrQb+78favBadyMIvAGCyi98PY1uGopsI4jXmyTwZEKfl96lZgkD6fcp8hPGzr6 QbjbmvktRPvcp7bl7Zng6I/bBFuPEhAeHVzK0PFA== X-Received: from plrf13.prod.google.com ([2002:a17:902:ab8d:b0:2d9:21a2:1910]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:32cc:b0:2db:3d84:effc with SMTP id d9443c01a7336-2dd6c5d600fmr121011565ad.6.1789460398023; Tue, 15 Sep 2026 01:19:58 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:28 +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-12-morbo@google.com> Subject: [PATCH 11/28] wifi: brcmfmac: Replace strlcat() with snprintf() in brcmf_fw_alloc_request() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" brcmf_fw_alloc_request() constructs firmware file paths by chaining strscpy() and multiple strlcat() calls for the module parameter path, separator, base name, and extension. In preparation for removing the deprecated strlcat() API[1], format the complete firmware path in a single snprintf() call. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: SecurityEngineer:GPT-4o [editor_update_file, make_kernel_build= _single_file, shell_command_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 --- .../broadcom/brcm80211/brcmfmac/firmware.c | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/= drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index 22ff326f1924..2f74a952599e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -845,22 +845,17 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev, fwreq->n_items =3D n_fwnames; =20 for (j =3D 0; j < n_fwnames; j++) { - fwreq->items[j].path =3D fwnames[j].path; - fwnames[j].path[0] =3D '\0'; /* check if firmware path is provided by module parameter */ if (brcmf_mp_global.firmware_path[0] !=3D '\0') { - strscpy(fwnames[j].path, mp_path, - BRCMF_FW_NAME_LEN); - - if (end !=3D '/') { - strlcat(fwnames[j].path, "/", - BRCMF_FW_NAME_LEN); - } + snprintf(fwnames[j].path, BRCMF_FW_NAME_LEN, "%s%s%s%s", + mp_path, (end =3D=3D '/') ? "" : "/", + mapping_table[i].fw_base, + fwnames[j].extension); + } else { + snprintf(fwnames[j].path, BRCMF_FW_NAME_LEN, "%s%s", + mapping_table[i].fw_base, + fwnames[j].extension); } - strlcat(fwnames[j].path, mapping_table[i].fw_base, - BRCMF_FW_NAME_LEN); - strlcat(fwnames[j].path, fwnames[j].extension, - BRCMF_FW_NAME_LEN); fwreq->items[j].path =3D fwnames[j].path; } =20 --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.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 2835446D2D8 for ; Tue, 15 Sep 2026 08:20:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460446; cv=none; b=aEv1Y6iZXaWTaz/07UQlcLYtZAhqdgghD7WjF1416uSwI0PdtouIRA1u8JbG8bcBD42vvWcfxMnHEVXT+o2eMbthNPRlN9rv8/1lcm1loxh59cxB0GZhtnAvLEqEMzgLMTZY6iv8W9QLyu/j5D41JfqiG/M5cDxQiBTpjRiOnvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460446; c=relaxed/simple; bh=OaAwr1sBjpntRvDMR8Yr1mj2+C2DlJcpETypf5U3EWo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ttDgVzAV5ULHkjsH4IxMV9w0RPq22yiQ8uf1dUVwT8AoIKDDrdhw9GqgAemyNTHvOFDw69MKdiGzijWGtHsxZcq/cA3nKBT0sArZ7Eay/PRKbraupm2tL3PTyGd53D9Z/dtF+ucJYYHOGMu9LObdblAVtmBiGRJgzSIrd37hL0Y= 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=C1JPxdcE; arc=none smtp.client-ip=209.85.216.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="C1JPxdcE" Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-39512608fb1so9970646a91.1 for ; Tue, 15 Sep 2026 01:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460400; x=1790065200; 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=ANECGYJQk2+Ya+FPrAm+IsCBeyM6Er0meffRIzFfkVU=; b=C1JPxdcEYI+7e4qNRn42ri7XycG8ZEbEHXMbIMb4ScSzwHeBQC9yzVVpc0VMl528g0 s0JOKqCVZmlE79RSsKOAPoHVtMJekRiI5lQq0ccm4VS3Byi5dyyA9BIC7NfptegBcYEK Zr8u5dCmbZpcjlzODfngmBvCnY3m5Uady1jZ5IdncRoVwldFgHjcSBs6RSa9Ft+TItIK 4p+OEsFrIJNZ91Q2YexeIhHNkaXoR/i94BUZNuNgpayKPwxnIkxz7bWvlaeZxpd4Uo5q N14BFyHcj46vcksmur5nafVBWlbjWhS+bxkgyZhVtVPTZf1TJkUEu6dEelSHqnecpiTc e3wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460400; x=1790065200; 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=ANECGYJQk2+Ya+FPrAm+IsCBeyM6Er0meffRIzFfkVU=; b=psXiD40G/fEqv2FuG9epnpzs+4hHuB5F1UyusyfpYrAx1sOMbEskRe1GTxFQirgs8r rXVX72W0o03tIsKmUP/6eyRApQMVBoPx1102LTzTls1zSZ39ah3aHkNV9E5XuwXuese+ YHMgJGVF7vyxDm1FPEAM6J3rG4AncgT/fnXdBqpnlMvirrowpaPL6NZLVdFcX/IGCxpl rqPCXgX2txQ9nNJmRcgA2Y1EixyU+yIGGbk4toW8peF8pe/bRPFbBbeuK5FHTltm5zLW vpUvt6TG7Ttip5NudDbbi6Z7knGMKTpEDiH+PeLTD2vqUafZNRuTbcJ6vokaQBZWs/AG o2Hw== X-Gm-Message-State: AFuF++n79Vh42mj6ITuDAk9k8EVCd4dimCSw1VEXbZuOxXz9Bazn4zfC EpakZe1UQ53ZWf4JbR8ptOmPyCmOy8OxZGx0tjLa4P4CNqre7vbpWcCy1yEVtRYZeZP1bQRoMbR o2pDsceG1kAG+FLGkSsgCrwSr+dHWzX3jhNGH8NXCxq03Hbc2abVJ31g1BqFAhrrd6SPI278Sed f6N5VXlqh3tTwWJHbD2VwTONRsquL0A3evinqZug== X-Received: from pllj10.prod.google.com ([2002:a17:902:758a:b0:2dd:63c:daa3]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ccd1:b0:2dd:40cb:a04c with SMTP id d9443c01a7336-2dd8386925cmr476775ad.19.1789460398847; Tue, 15 Sep 2026 01:19:58 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:29 +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-13-morbo@google.com> Subject: [PATCH 12/28] fortify: Convert strlcat() to snprintf() in strcat() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The fortified implementation of strcat() in include/linux/fortify-string.h currently relies on strlcat() to perform bounded concatenation and detect buffer overflows. In preparation for removing the deprecated strlcat() API[1], replace the strlcat() call in strcat(). When the destination buffer size is unknown (SIZE_MAX), call __underlying_strcat() directly. Otherwise, determine the destination length with __fortify_strlen() and append the source string using __builtin_snprintf(), preserving the existing fortify_panic() check on overflow. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: SecurityEngineer:Gemini1.5Pro [editor_update_file, shell_comma= nd_run, test_runner_run_kunit_test] 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 --- include/linux/fortify-string.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/fortify-string.h b/include/linux/fortify-string.h index cf841dc71fef..0b489124bfcb 100644 --- a/include/linux/fortify-string.h +++ b/include/linux/fortify-string.h @@ -363,7 +363,12 @@ __FORTIFY_INLINE __diagnose_as(__builtin_strcat, 1, 2) char *strcat(char * const POS p, const char *q) { const size_t p_size =3D __member_size(p); - const size_t wanted =3D strlcat(p, q, p_size); + + if (p_size =3D=3D SIZE_MAX) + return __underlying_strcat(p, q); + + const size_t p_len =3D __fortify_strlen(p); + const size_t wanted =3D p_len + __builtin_snprintf(p + p_len, p_size - p_= len, "%s", q); =20 if (p_size <=3D wanted) fortify_panic(FORTIFY_FUNC_strcat, FORTIFY_WRITE, p_size, wanted + 1, p); --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 6DD6D3D890D for ; Tue, 15 Sep 2026 08:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460463; cv=none; b=GixeSTcOe9Nnc1wLQoHvD32pFpKv2fVcUFMOF4irnk10w9O8O5lVK8zpZ/E0PWizxSR29wp9IpmJmeT3QQpMUT1VMOl7mbwVIwrapfsXzsmyO1dxmL/pCzC1WTqXMcPIHMFPK+pcCizDOvI8BVC3/+yxWRKSPzzuTsLf/rUAB+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460463; c=relaxed/simple; bh=gmsmGVxkrCC0joHW7g2qwHGDO+picAoXZWIoiOn43qE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jLYlvDXyYw18jg1hg4eizZD+N85AacwFgEf++oC2rWJ4F33KJIttsy3XyutSCKKqRv9uix+mdHFTZ/ac6RUpGE9Hr4n+rVnSF3qfeMo7pPeKov9NduEiEE9y11QNKFJpjWNSLtEs4XsbjRW+TWkhoEJmiM4igSOdqFzEAYUnu0U= 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=iBtmz3Gn; arc=none smtp.client-ip=209.85.214.197 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="iBtmz3Gn" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2d9057fab9eso68049425ad.1 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=1789460406; x=1790065206; 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=YdNQWB21luiE9Gdv0Q1IFwuCzs7Lvdhhb2Hfuit5b6U=; b=iBtmz3GnJkvwQtWy+snq8/8HkFAvGR9mOsfp8hdBb0LostnrUoKck94CCex9LAtzmZ cktHJtFb3Zlls88Kgu3eEFyjenAz/63MiC5G1N1BFg/IeK8ARfwY7Mj3BU1K1INtHDKH PVbGxM0urGg25cG5s4zzZKfALCFj/T8Mr8u+TlcYBVrdTN7j6/vgGubIvoyOxNiPG2aA /ELkpUtZZmbhkK3qTPlLSoosEDtlIZUtWe2RoUGppaQ+iHD9LyJ5WqtCQMiQf3vHaCL2 KeZcl7gyYqfi5/qvIFUHSuORVTl4Xj6ara78RTAfrVb40QfHpR8UoO8RKjvsJwQBfxCI KnVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460406; x=1790065206; 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=YdNQWB21luiE9Gdv0Q1IFwuCzs7Lvdhhb2Hfuit5b6U=; b=TIYTIv7UoEhgdu/PMQRaWVtCnmIWAJV4eXIvT+8dTFiFZe8ZxCXKCLbwwQ/n1vkQ8U n0SxdfeRPFbl5LTba+u7Ty1oe/3Y9Qfg29LrsuZLTB9B+v15wIlT74dzb0ImFroioN1t gUcRI+4Bsgx/UwcbHLRM8nfrBrLrjRMFLKuxYkFTxChEzmHnQ/d1ZP5WBa3/toYpkQmp a97FdOaQNoctUH8a3A5r7AvQqJOHkDQPMvrxRmuD9DyM8eXcUQ1NRtfSXVu8W5tHRBBs LaibLL/Crgm1DZ9Ke4oVuQGWz87vaB1PHCLo3djUXxlzw8pbK0GHDbDs0/riMMNkxIUJ +Hog== X-Gm-Message-State: AFuF++nl7s8hVoN7sxon7mx3pYj3DcdKSO9ZTDNFqunRK+R37NS6wXKh Qrrqgs+Rd/WhT+XndnmPeSex2g2UQ5Hc+hWDuHmi7l4WZZIN8HAKo6AUOts96ubTiuf0YsBvr3W RlX9VC4AqCutQFRAR4zJblC3wAxY7ryRBhedMb59g+k36wXh3BUML6J5i6m/6oLYCtRVr7Kd5jG spx01kUU6vhZeqTk9yGQHPXXdGo3e+em4KwPp6pg== X-Received: from plld7.prod.google.com ([2002:a17:902:7287:b0:2db:142b:72cc]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:238b:b0:2d8:d4cc:5bb1 with SMTP id d9443c01a7336-2dd83867c8amr573655ad.17.1789460405925; Tue, 15 Sep 2026 01:20:05 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:30 +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-14-morbo@google.com> Subject: [PATCH 13/28] i40e: Replace strlcat() with snprintf() in i40e_nvm_version_str() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" i40e_nvm_version_str() uses strlcat() to optionally append the EETrackID and combo image version strings to the NVM version buffer. In preparation for removing the deprecated strlcat() API[1], replace these strlcat() calls with bounded snprintf() calls at the current end of the buffer. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:r1-preview [editor_update_file, shell_command_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 --- drivers/net/ethernet/intel/i40e/i40e.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/= intel/i40e/i40e.h index 1b6a8fbaa648..9f792128a0ef 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h @@ -1059,19 +1059,26 @@ static inline char *i40e_nvm_version_str(struct i40= e_hw *hw, char *buf, size_t len) { char ver[16] =3D " "; + size_t offset; =20 /* Get NVM version */ i40e_info_nvm_ver(hw, buf, len); =20 /* Append EETrackID if provided */ i40e_info_eetrack(hw, &ver[1], sizeof(ver) - 1); - if (strlen(ver) > 1) - strlcat(buf, ver, len); + if (strlen(ver) > 1) { + offset =3D strlen(buf); + if (offset < len) + snprintf(buf + offset, len - offset, "%s", ver); + } =20 /* Append combo image version if provided */ i40e_info_civd_ver(hw, &ver[1], sizeof(ver) - 1); - if (strlen(ver) > 1) - strlcat(buf, ver, len); + if (strlen(ver) > 1) { + offset =3D strlen(buf); + if (offset < len) + snprintf(buf + offset, len - offset, "%s", ver); + } =20 return buf; } --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 6FF80472084 for ; Tue, 15 Sep 2026 08:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460459; cv=none; b=obHkqZyOqaeDVZbhdW64FTtohKFMlS7EaCfj92POJILzS7uKVh/5ThOVZWxtzUrElp0XgGtAPZoQTUA/Sm4DinCc/HF/pfrBbJibScX0O0AUVQMdLMoGYfT7WTTX+ByFeLfRg9+G0jV6RY1rtnJ5cF0XTuhX2tbXsCtGoPyTrF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460459; c=relaxed/simple; bh=zW9p0CztRSiZVUTiJTuEFyMkjkuMAZaOn1FMnzhmj88=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uPlvvqnVvqeDHQoyVnI4TW+VS6DIC/aq6NbNGLo4/RhJrq+v+QwvLU3YT9W6UZEiYi2wpApK+C4uotTekAnYoG4cl56NFCFqGsjueJEAeuduDAuRVRx70Y1jVHYn06uXXk6Fv1fnvvxcxjWss6WNwh0Q+wm6O5yTVGbZAEv05JI= 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=KWcXfgJ4; arc=none smtp.client-ip=209.85.214.198 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="KWcXfgJ4" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2dd753a52bbso18792095ad.0 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=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=y5tFxAHb/e8uKrTICVzoygvHAjZ6k748iiDqUmGJfRE=; b=KWcXfgJ4+FaMwJLl96wBD/F113qE6yPIWO6cxRtACLZ7BEC2vugmZUf/DNYgZgaPxy kqbhoqhpuCy1aVuiNViEZPMtTkUHmI6XYGDtiJVKf9tHjndqVPIMl5ZHXUkTQYUjFQJL CiKE9ELGkyIhe0T51MznFME/W+D6jj0O/Aby3gfcIUhMUWCVtPQw7BaPVbADlv8Wcx7N wAMf+DCkJIS9a/XWDFQZphu9B8VLzwnbTKPlelogEDTjrcoeasGUWfxwGIlHNcht8wJn 505Z2gsG+yWhEDJqTcB+XydD5vP5Dzadax511XxRXmUo3PUjrBKupscTY+YD5K6D+KbB ycBg== 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=y5tFxAHb/e8uKrTICVzoygvHAjZ6k748iiDqUmGJfRE=; b=XFnCv3F9UdMLEdqMFSaOKKdN6U6Czm580JB0overIbP6ByI677nfQ16Q+Vw4SBLI+T hqjlnSH2FWw2foFZ+keVgoEoW/FMG5TihRyZn7yASRE5+PMMN6xCCKVQBXvQTH+NXVmM jDqoAO/P+WPLt1xWVkBVmob0PCjsjSuzYHBvhWVkucCfKtatdOjHJktWogPoscrrptlD WuefL03djiMlkD9VvZap54AzcXHS99lDB/Yz+QynWJ+O7fgPm5jpiyhvZVa/VjyLTuJy 470G3rrGv/s9RjhnvKH8ehRXLYTDB8FWciXxUaG+plT1UZDt+gMl7xRm5bvxYLpNyq43 ZDwA== X-Gm-Message-State: AFuF++mZvs+QCI4nhaq+0nwaURugUyIjxR7YE4QsK9m0qFD9A+/1w2Mq +lu1LFTemOQEt4N2/zLBJR1i8z46Zw2YvrlREbTFWzglvMBR/x1IMtfQMdKuoT2IY6ME42Vp9W4 gZowPKGstHcVgBBI/6tRokh20lDPK3LUjB0Grmtma7/SVheaMuPNldiROtQDUT5YMCFNMvp1Lhe xTsDu81Z3fdVVrePMKjRfhtjinDgP0p5q1bWk3iw== X-Received: from plav12.prod.google.com ([2002:a17:902:f0cc:b0:2dd:3949:eb03]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c40d:b0:2db:5c0a:f184 with SMTP id d9443c01a7336-2dd6c6fc4f3mr121827545ad.17.1789460406752; Tue, 15 Sep 2026 01:20:06 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:31 +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-15-morbo@google.com> Subject: [PATCH 14/28] ALSA: usb-audio: Refactor append_ctl_name() to use snprintf() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In preparation for removing the deprecated strlcat() API[1], replace the strlcat() call in append_ctl_name() with strlen() and snprintf(), preserving its return value semantics (the total length of the string it attempted to create). Also replace an open-coded strlcat() call in build_connector_control() with append_ctl_name(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:Claude-3-5-Sonnet [editor_update_file, shell_command_r= un] 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 --- sound/usb/mixer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ecaa8bc08d7c..f64ecad4e77e 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1722,7 +1722,11 @@ const struct snd_kcontrol_new *snd_usb_feature_unit_= ctl =3D &usb_feature_unit_ctl; */ static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str) { - return strlcat(kctl->id.name, str, sizeof(kctl->id.name)); + size_t len =3D strlen(kctl->id.name); + + if (len >=3D sizeof(kctl->id.name)) + return len + strlen(str); + return len + snprintf(kctl->id.name + len, sizeof(kctl->id.name) - len, "= %s", str); } =20 /* @@ -2090,7 +2094,7 @@ static void build_connector_control(struct usb_mixer_= interface *mixer, } =20 if (check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name))) - strlcat(kctl->id.name, " Jack", sizeof(kctl->id.name)); + append_ctl_name(kctl, " Jack"); else get_connector_control_name(mixer, term, is_input, kctl->id.name, sizeof(kctl->id.name)); --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 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 ECAF13DA5BB for ; Tue, 15 Sep 2026 08:20:09 +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=1789460473; cv=none; b=EjMl0DVCYl7qXCSz4Nbq9GOlz97iPyFeqXjSnObvZbkW/SnY6flBhGbSfL9dEMHrD/1+Z7iLydToqPZPuapVxgWkCOWc1J104lH/PBkPoFNPUeCvr8NVkE5yVarbGVj/hWBeQtyd9+JgLQyVheK1VqwaX9K1m2XqnBf7PF9Ojl4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460473; c=relaxed/simple; bh=z7dasmw4/Yd5J5NMYLIKQKAVayxIH5dLlb/JPMHBnRA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MWQMLRDsdKd9JeuZuzhIHmCsI/WrOuVHiBCikCCkAiIq+NBndV/i4C084PQ06b+VP1JcYnfqV0vUuLJrMjbInk1uSHiNsZoofnQrO1Qe73iuFofuIYqMxyRTi3S8/Bw0DnjYe1XGogM14A6plUtnjU/8EFD4w2Qail+igrNnq5Y= 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=DnkxJOzA; 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="DnkxJOzA" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-39d8646b10eso4287020a91.1 for ; Tue, 15 Sep 2026 01:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460408; x=1790065208; 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=jabuqrMs8PQTYoTuRH1Tce2jM5ZfyHhnXojFxmEofr0=; b=DnkxJOzAoYRCvFrZNk61l1D/qL7p6eKsJCT8XtQ2LGfkP45WZDxWz+OJQxlIz84IKb MYOUF5eg2kJaGwcsK75t1FQYHvvOuJ1hJBQAlbEG+j3wOQ+Ga+E+8yeCWIJtsN/B2Q7h uyUvcSV41pGlf+lQ1qS9X/yPmlx5TzzQjayk4tek7rCmZ6oXMf6J5SGt29zqCfU2sK76 mh0UG8NgBKykfkhIS7NKBs1uyGwwJyakNCtuFF+vreH2UHkQ9bgNSqCoRzUaLDigbonq KQ8EIVMNfuo4wfDS56OYC/SnEG47oux3eQnv8+PGUcAHN7PgFKmpV3mYlGRdC3DgKlA6 3Daw== 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=LygBeAoUTMnhn7wc0NubcaC05lQsA+n/LH6jN/pNoKqXz/qzvJRRfrhUnpKBbALfLU ulAiVXxTSqXDjCWf96de7BcMzfKrSBmJ0nO+y/GZIaKJg4zkBUi0Gtj6O+ulDHlOGHeA C5NTZFYKu9lhxATRACPECkjwi6C2T9xJdfmwb8f3QBvCHdBaVnjDoaxioML6GR4xjfj3 aQhIZ+QSC3dTgWyuWEzRXqKNhtykCnbMMVfuxYYjs5V5PnGyFPH5S4/ZsXiU0ZRTGbhB cSW7CYYCZfnFBOBJheQhVk0gpxK4X1MOVPivvmaygvSyzT45vaF58MaMcrE+pXxg1al0 v48A== X-Gm-Message-State: AFuF++ncy0CsxZU45DROcizbKWsfx9DGroDUTSXExje3Be/msbVXsHdX WMfImEHSfm0FIH9MNVG5NPpzicG0i91PEzURNF83AY+05VwTB6HiuHT9hCoFckaOyS+ZkQk52q7 2WFKhG07Qdl0NGODi0vmMVsAzkz5OeW8RgCcs6Yj/P/xy3o9kmG6LV8XN0q5rzmvwUKlcr/nzCr twgYqf3OOmYFhWAvStuHEYopJ3Mg9lvC445hnupg== 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> 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-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 From nobody Fri Sep 25 07:55:59 2026 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (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 80C534746B4 for ; Tue, 15 Sep 2026 08:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460729; cv=none; b=lbkJQiSnNGelMQnOqee6ebnMWeLTKdxD8WpfTAVh2sdwaL11tzVLocmbiKjeG8XJV8gIAAvP3wJkJSB3foOvz72Swdty0cvvxQ3bboGECQyAe0lyKd6zGcanyaPkbyuelmk+OnMOD7IdwuUGdsCwvKGIQxmygmqsfKS+mx/3hZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460729; c=relaxed/simple; bh=lI3TjsMof+VUseu3jlc4aD2v6CaqWDV2PaTkxHX+GRE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IxSxDYWfO7C8Uy7g1oXd31uQROShxicWlKKXbHdntd2l/NsTTUXS2dxQraB8QrYHCRUMlcIE/Mx4FNqQFh0g7xMbAhVJtpdRscb8xCuNeqDEBE1pM0GlNw6p4HvecfH/MsaqOg/++/oML74vI5uyGK1JELwX00rE5hGwB4/4110= 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=C6HkJaZ3; arc=none smtp.client-ip=209.85.219.69 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="C6HkJaZ3" Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-91219341db7so75206626d6.1 for ; Tue, 15 Sep 2026 01:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460726; x=1790065526; 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=jD1fGYdmSfmtHfbCTu69NC0iIcRgu3QWne7aaYuG46g=; b=C6HkJaZ3MYHwbD9WCgQHzpcjfuLOAj83zyHQGDUaFFNoASGrqlC8fhq9QQB17gcDjp kSorSUd1tvOD/jMvVAIYjzNzNBIP4TbsCgX8oAadAV5pt5ThE2HIzBOkellQXStGJ4D4 1w0yIycNDAlak1r6yHTFGTtq/gW9VlERo6ErjIeOJymJk85z7VweKPe3rWDIrlZ5nDNl F7CcFuiq7T4jelYPoKalMGIY5iZiTJsimIfLdT1lUl8ZezIA6LXoxO+dMkQgoovNIU9H utp4xiDkUzYyQUtyGHJx9Rg9llosalwR/E0Qf+8CFZHxI1XCJy7SlxBf/3r1F0qexYUl RXQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460726; x=1790065526; 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=jD1fGYdmSfmtHfbCTu69NC0iIcRgu3QWne7aaYuG46g=; b=zJwC1iYQXb76mFD29eDrwCf9cbRapMBD3hQfj8Hc/IYjYN5yzjNu7lyvFFo3zhhVW4 +fwEOSA7bstl20vEZFpB6wxc2ByE2/84a68k8kPd0D+Crw0DLN9IIXLXVs0e7vs2nRny psz0etCqAGba8mAdCP0FO4xoPZOqmyhBhi3wA2fP9TWiwkpXYBPHwnXYIGTJx0fLNxV1 g0NLG/vKTT+05PEY4hyJ5TEGzGuVZmHFAT2qnZJkj7wSPhgM7vZhtVu5MZXdajMgaeyi 8uQ3BakIMlZg6gq5DemjfLWDM7/M269xa1y7Hi2un40Wheq+4GAbbKzWksOao4g4BxRI XaaA== X-Gm-Message-State: AFuF++nEUqO31rUTjLmpQjWM2rWp1T4SVwe5eGiO/QyYqGWrUq2CwmXd 2k76VS0czNqzlekV9AhOMTSmj3oJiwSyZ42FYuO62Rz4T2INprfxYa7WdD1ZIRrE3cinfNe2zWR vkvPafW71NVpmXDsbsykcc63m7svg5jYuDy2/ECz2vToGIU0+os9LYK1idwSYzND9+VhF13pUil yT0ADJJin+yWHwRxXgaA0C2IZIGdPdG2DfQeK5ww== X-Received: from plbkq15.prod.google.com ([2002:a17:903:284f:b0:2dd:1c44:fe2]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a0c:b0:2d9:464f:d45f with SMTP id d9443c01a7336-2dd6c5ba2f0mr129830935ad.5.1789460408347; Tue, 15 Sep 2026 01:20:08 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:33 +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-17-morbo@google.com> Subject: [PATCH 16/28] pinctrl: samsung: Use snprintf() to construct pin bank names 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" samsung_banks_node_get() constructs each pin bank node name by copying bank->name with strscpy() and appending the suffix with strlcat(). In preparation for removing the deprecated strlcat() API[1], format the node name in a single snprintf() call, which preserves the existing truncation check against sizeof(node_name). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini:Pro [editor_update_file, make_kernel_build_single_file,= checkpatch_run] Signed-off-by: Bill Wendling Reviewed-by: Aleksandr Loktionov --- 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 --- drivers/pinctrl/samsung/pinctrl-samsung.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/sa= msung/pinctrl-samsung.c index 5ecc9ed4c44d..0d639eec689c 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -1155,8 +1155,7 @@ static void samsung_banks_node_get(struct device *dev= , struct samsung_pinctrl_dr =20 bank =3D d->pin_banks; for (i =3D 0; i < d->nr_banks; ++i, ++bank) { - strscpy(node_name, bank->name, sizeof(node_name)); - len =3D strlcat(node_name, suffix, sizeof(node_name)); + len =3D snprintf(node_name, sizeof(node_name), "%s%s", bank->name, suffi= x); if (len >=3D sizeof(node_name)) { dev_err(dev, "Too long pin bank name '%s', ignoring\n", bank->name); --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (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 3D93546D2AA for ; Tue, 15 Sep 2026 08:25:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460721; cv=none; b=PYkLjAmI/r9Hnk2XmDG7Hm0HlFi3dT+ztYP1E7sDca/SvT9YOXtodthcdShDF1G3Oiq0uF2zM12JSU+VzgJACTrbNfZHs74iLrgmFioWVG1VCkQydcBmEbSofMBZG+DcvnNsn4okP8bYmINu6y5r7uVn0Qsq9/RVJlMiTPmGEtQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460721; c=relaxed/simple; bh=LqJMFQGliTTZ9KNIvLTBQqllQDtaRAf0jEikiPuUKto=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=m5ox2W742D6zu+eVuOHS8Bcsi9vfds7We8V3HqNbCwIxozzG0fnCchKBFg91Pm3dDC1WXW5XouYYIgIjQ6mzYWbuWF0/FNOpoI49XcpIF+Zd+nYFwcpS8jKOwSxpUxENmA3CukpWr9GXViWIP+DdSGH0GTiOBcC0KVcV6DRNU9o= 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=ufA9Y81V; arc=none smtp.client-ip=209.85.222.197 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="ufA9Y81V" Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-93a1de6d5c3so428432685a.3 for ; Tue, 15 Sep 2026 01:25:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460718; x=1790065518; 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=eELVo8fI0ZjlHs2eEJ49S4+N/SPMib/OwBxEH2gJjRU=; b=ufA9Y81VZGAzbZJBb+CsTmPtcLzvKzCL/eyyZhAR4i42x5zyJbnFVJe9WVDh/A4qfx w8wD53vAURPHb1Nw4YVa2ao/R7hTJwAsi6o64qm3ZIp4ZPWVmfu6YKjaKSL7o9OaUAcH aXz0G6Er6twpfN23p1x+VvHngzh9iM7itcLzXDVm+kA+cGTG39qxMjlFs6XwaTqEiow2 wWsrBu2RmpTiwM92EOFxB7Bxn+fqvCmQZ4rwbIHYdHpGZnIqUpG7YU6lO5C32TMYtXsp uiGjnOqvxFCP5G5Go5A6nXghh8tRjBnVFzFn6hMoa3znJvbkOPbgN9t93/7169PH5pGe 0DTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460718; x=1790065518; 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=eELVo8fI0ZjlHs2eEJ49S4+N/SPMib/OwBxEH2gJjRU=; b=P2RIqje9YZ8YuWc1ofawdABlFTsElL0YzBUP5cqd0l8f4TlGfpNDuulPf6sfCrOM6b mQmV33uwF8dW5JzA1W6FhTpUi9d9/gNArBXW2SPUVihpjD33WMo5+OoIN8UXaBP3WAH0 fcfkUJneokLCpA6h/PmUGZL7zOweq63XTQ4xLQ1/OyHIUo/bl/yxU4rlJcZtmoj2WXPl Vagl7VlN/uNQ8OFFtAi5qYwB6ZrNhjBIp5siTkVqw7WXIM2o+zl7amM56shPt/bcoXNj biBT17vAKqN3psS71Oq8unMlNgU4JqUs05gooZGj82cn3qIBmXSvykJ8n12Vo63t96wC oOxA== X-Gm-Message-State: AFuF++n4H6ly9WaPWSuJ8KHnUyrf3u4Avh5BAuayx4BO3KsNLGNEf+KA c9lfP6hlsvqoyQcOU8iNoXyNuXGSkFpDEjj1oZmuiriXdbiR94HIIb220o1p3f+fLRaztDMj1Fq ajLQtcO7WRL9qAx9CrxJPKpP4yL/OTpNJYBed7UC+g+Yd3LeyXZbEEOJnUZlhLMjEZ71usDhxdh WneEnE9VECl4fnGn3PQLq5jroUHjMF2hIwSIuvqg== X-Received: from plvv1.prod.google.com ([2002:a17:902:d081:b0:2ca:ceab:34a3]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f612:b0:2d8:d4dd:24c0 with SMTP id d9443c01a7336-2dd6c7e1a9fmr128970685ad.21.1789460409250; Tue, 15 Sep 2026 01:20:09 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:34 +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-18-morbo@google.com> Subject: [PATCH 17/28] MIPS: cmdline: Refactor bootcmdline_append() to use snprintf() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bootcmdline_append() passes "max" (the maximum length of the source string "s") as the destination buffer size argument to strlcat(). Because strlcat() expects the total size of the destination buffer (COMMAND_LINE_SIZE), it fails to append anything whenever "max" is smaller than the current length of boot_command_line, and could overflow boot_command_line if "max" exceeds COMMAND_LINE_SIZE. In preparation for removing the deprecated strlcat() API[1], replace the strlcat() calls with snprintf() using the "%.*s" precision specifier. This bounds the read from "s" to at most "max" bytes while properly respecting the remaining space in boot_command_line. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: SecurityEngineer:Gemini2.5Pro [editor_update_file, shell_comma= nd_run, make_kernel_build_single_file, test_runner_run_kunit_test] 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/mips/kernel/setup.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 1ae6d0c0e1d6..0d9c2137d675 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -518,13 +518,28 @@ static void __init check_kernel_sections_mem(void) =20 static void __init bootcmdline_append(const char *s, size_t max) { + size_t len; + int prec; + if (!s[0] || !max) return; =20 - if (boot_command_line[0]) - strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); + len =3D strlen(boot_command_line); + if (len >=3D COMMAND_LINE_SIZE - 1) + return; =20 - strlcat(boot_command_line, s, max); + if (len) { + if (COMMAND_LINE_SIZE - len < 3) + return; + + prec =3D min_t(size_t, max, COMMAND_LINE_SIZE - len - 2); + snprintf(boot_command_line + len, COMMAND_LINE_SIZE - len, " %.*s", + prec, s); + } else { + prec =3D min_t(size_t, max, COMMAND_LINE_SIZE - 1); + snprintf(boot_command_line, COMMAND_LINE_SIZE, "%.*s", + prec, s); + } } =20 #ifdef CONFIG_OF_EARLY_FLATTREE --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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 9273E486BB5 for ; Tue, 15 Sep 2026 08:26:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460799; cv=none; b=SgXvsD3S1eHEiBi1LsDqsLl5pgbd+5bYzqbzkxqa78mVqVLuAzWfFlwhlGq3HzXdxPGp+hVpDhToIkIeOUVawGoH1qjCmu8ceksHjUuLiCidiFQzE3WdfrDL0983KTcULqtPezH0ETLF6Tj/3Uv84Irl1svW/S8mLasQEUfU2+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460799; c=relaxed/simple; bh=Hbrp06lq3B7opj8tzjJVqcfrxhhZTvzJ1WqUPePmYuc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EvfcamWMPdrksKqfrELpaWjmrJ0aa0RjxukO4MX/F82JkYSgdnkzowgUtF3GbElpQHDHZq/OoeIULc5HLxobvOAUVWFz2YZ0jMGw8zEcPsHL2aDhf4CNF4VeV6VKQ0gLsQhS645/9xCK+52+GDRQq7nUi6OgpAjNfyFtR19D9ls= 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=plZ1yrqk; arc=none smtp.client-ip=209.85.210.200 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="plZ1yrqk" Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-869b8d63e28so5217452b3a.0 for ; Tue, 15 Sep 2026 01:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460796; x=1790065596; 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=tzVl62qjzRm92BALDDypl3TnCOJSNAaLaOJ/zmWRh10=; b=plZ1yrqkCcoXlNXcPpA56jCZNYCLAVtsggNA7VUzG/aU3Mm7f3sEZWt2jitR61GLXF LbCMJ+L/Q7bzPc4pk8PcLV2BBbSV7Hf1NYLbMl7dTJ8Vu/96sonv8UGi1tWTD91nXSyn X36Ay6drtQSb1tfkDwodsoMqa1Np3P/pNZR9jPvu0hB/nB/HE4/DouZP4ePY93iQ63vG MXVgMfQN1DbmJJvf9kV5f3Jw/26LEQ4dwvD62e0+/GjqyEeOwyZ6HzXlTdBXyZLBGML4 +jA7pvE71hXlr3RWPsCHy0mCLKPgsxD+erBR/jiWStWlhWqpJ90g+tkz51XJFOWO+CgD OF8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460796; x=1790065596; 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=QJb4u9fdED4U3XgmE1E3Wpx8GAKmd2cDynKqKIpCAbp2df5dd3mRZf/6VG14wF12q3 9pF8CJIjc1phnFmXrrVF4RPSLJxROxEq22bX29csZZclwDEbKObKzHMwPxjrcPvmK988 hZfc7BelmWVwNItuu7yqlFJsGOo21sUcLLoWRuAo4+Lvsb0Qhgk8KQWdXmeIw1OP1xUZ yEK06+jrszHaeOJ+Ti91LM/Rfw/AB/6veUa4yvjHU8QibdFFvIpTXUZFy516xTmzRnXb gbL+5yqHCPJvQ43NEbfUQfROBfiCoDUIL1HvH2bUbkcIUdDp5yLTtuzexilKiF8GF8zd cP2w== X-Gm-Message-State: AFuF++nEYtaDEyWJdrBvBk9+e1du4WBaPMUbfLe4QkXpjDSJ5pE1fQHn 0LEWHgWITG4S5l4UALlH66uBiO7UKpxF0BpURtu95nABi8ANGfqcETe6SPtY/bvC5MMokNDJGhc fgk9LSCpFJ0MOgwHTKDYkh3prseLR9s19qSvQIlW0adDblRhmvwCVB3zudokfbOjiPkZFe/UzCU LyOhuP2Ctqz8v3jRCpfwRGZq42EaPyfSqxdFGvaQ== 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: 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-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 1AA6B3E95B1 for ; Tue, 15 Sep 2026 08:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460473; cv=none; b=VcLJJXhOfJzad5MDcqN4q84xCiQjyJWrK5GNuUSXV4x0/HRSioAr+IhVgfVeF3m9x9M3Yn6er8KAIX6OrNDpQ6X4/LDBjJmXbT+/WSHKCrB5d4oFgzYeYZg+g4U1lC6n4MeJV0uvMu7SHsETl5xSUaMBOUAolKpml2Wecol+ADE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460473; c=relaxed/simple; bh=EqxPY8uDyH4sIF56bisQGVYV4UgUVWe6Fa26kaXaoOs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=o8GtoppAJ+w0dSYwipsGSKTsV95gscW05SAULgBTooKfJOElvIYdW8C1otbbzOEl0835nsYNAsIH5v3Bc78ttDbzmYdOwqvTdH9WR2hnz7I3gX8UhtBpibctfCNIFwqaULQgNHlnRkI1Re+LYff2UK+yTIngeq893i2Pp8Hu0Y8= 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=oAQ/C1UY; arc=none smtp.client-ip=209.85.214.198 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="oAQ/C1UY" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2d959904658so74607755ad.2 for ; Tue, 15 Sep 2026 01:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460412; x=1790065212; 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=XkXp/XZtfYpYjiXJEDXdoQGA1NlHq2kVyqBGidLpG58=; b=oAQ/C1UYbC4EnqfFvZvyuVezkFqgc9cNQDgtAI8vUpM5JPaSP1bm9HT+VlIo/kbt5k 7+KLZYuZ6EC3y8a3TdjzhnCt1lrAFuwJU6P+KAXNWiDyiOIOAjLubjNzeq2LafCXwz/g guRJjz9BCunMssVSQN1dwdnGD+V99XD1oauCcDV7lj5wf/EJhrPHlq3ah1zzRC2zC17a fCopklhW5lmpYQwGrDhb1J9IB79ZeHW0m5yt2I00gDkL7DAtIiBJyVtCM739TdEh5xP5 PT6zWmhCEW7katUCjeLpcL9On0QFUolqMFMB9yowChecDcGj6hlWSW0BhBJQQijZrS2i 860A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460412; x=1790065212; 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=XkXp/XZtfYpYjiXJEDXdoQGA1NlHq2kVyqBGidLpG58=; b=iatYgdDQGwVw/Xb12SF05TgPAtzPzGZ+0+AD15EQX7k9Z4QFo6xkR3jBTu/NcX/2qV cWp1Q4JeNlB3S1TWsV0n4eF3cpGIhFg7hStRJ6IiPFKRSVNfs9r6UD8oh8JYal11ZAH1 j/Z1PogTgzdOIZAIYLakt167fwQ2VIBxVZaJpN35PWikvNtEbmTIpASU8LwcfvLIwh/1 YgRl5D33aQPpvhFHeF4c4mYKOiUR7JK/FWS2VuIN+XJvuvzjpApnf/Gf/TE3cCaMWqPq fkx/jhLd+MOGKBh0UkkEMuNgrUZ38ssGo7HDCGh1+sVDkGOqfqDEuubYiqTgyYSCRwW+ RfkQ== X-Gm-Message-State: AFuF++m2/jYOZXXzwlC2yzVj9bi74Jd4eES8mNkrDoipe4emkCoBjPZv 2e9B1kY4C/4s3I3mBIO6k1A31eLnPFJC6StmIq/Qv2WxZ2mEpMe4ILXlP+GUlP7rxSr+Yb8ICb5 WYOjr6U9K01LjDAOMvsWhwj0C5Tqo1xErgAO1Vtk4sScsmBL9IHc1iSfVvn+eTFTJJJgLxl+vUj 9fuLJsrVTe+iflISL+an8K9EVec2HbtdOFlrkYNA== X-Received: from plbkc7.prod.google.com ([2002:a17:903:33c7:b0:2dd:630:cea4]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1965:b0:2d3:716e:e2ae with SMTP id d9443c01a7336-2dd6c5ef019mr154580855ad.6.1789460411846; Tue, 15 Sep 2026 01:20:11 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:37 +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-21-morbo@google.com> Subject: [PATCH 20/28] parisc: Refactor strlcat() to seq_buf in setup_cmdline() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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/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 #include #include +#include #define PCI_DEBUG #include #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; =20 *cmdline_p =3D 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); =20 + s.buffer =3D boot_command_line; + s.size =3D COMMAND_LINE_SIZE; + s.len =3D strlen(boot_command_line); + /* autodetect console type (if not done by palo yet) */ p =3D boot_command_line; if (!str_has_prefix(p, "console=3D") && !strstr(p, " console=3D")) { - strlcat(p, " console=3D", COMMAND_LINE_SIZE); - if (PAGE0->mem_cons.cl_class =3D=3D CL_DUPLEX) - strlcat(p, "ttyS0", COMMAND_LINE_SIZE); - else - strlcat(p, "tty0", COMMAND_LINE_SIZE); + seq_buf_printf(&s, " console=3D%s", + PAGE0->mem_cons.cl_class =3D=3D CL_DUPLEX ? + "ttyS0" : "tty0"); } =20 /* default to use early console */ if (!strstr(p, "earlycon")) - strlcat(p, " earlycon=3Dpdc", COMMAND_LINE_SIZE); + seq_buf_printf(&s, " earlycon=3Dpdc"); =20 #ifdef CONFIG_BLK_DEV_INITRD /* did palo pass us a ramdisk? */ --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 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 03DF14749DA for ; Tue, 15 Sep 2026 08:20:22 +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=1789460474; cv=none; b=oK3bJ/pkqeKE2lFFsC3NZkkgxBMZCUunFrlYq4OUORg80RMrbXakTDuVBpWDkBu7ekVmoL9sc7Csj2bT775f8CKhbaDQESYnnmf6VUHerfii8ATMVEnPLdBLUsqZpox9a2JUACwkLiM7GZcOZtoV4B6kCutfU45+VEQNKlK+rtw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460474; c=relaxed/simple; bh=fIMzPvcr9X2eD4+Ac+cNHBPnvQriFstqx8IX88uxT8g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=AvcaxU6n3K9uvhZ5CS9dGuZrnhTsnpLg1C93nSFF82nCxMJd5ssbmRLsLP0Tbn7YO0UgXtn7CvqyDHtetqjTHpaG9W6KYYh/obCslWj8JPxOVHQuiqii4CPmlqWkE0jyBqBz8jXA215gaMtTsBY8mYHwEVt3hfgucsH26thGUd8= 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=XNBwS6Zl; 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="XNBwS6Zl" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-39deda201bcso2505213a91.2 for ; Tue, 15 Sep 2026 01:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460414; x=1790065214; 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=uYw3XH3TVDlWH5yZkMBbor+NJ9bN2wpB4N7ncSus1u4=; b=XNBwS6ZlysMhxrUqqJ/uLbHPTUaSSsIjOvuIHGTZX+PnLOh3ty/EUnYyXIKNeG5PkP Oxqgoa+5XZX7qXt66zx2QE+STRW4Fn39I34TQMNBRz2oP6dJARq2mOb1vyHXdBXsTOvr kRbWYPOP96GHKP7m40wZ8TeuSsEufgEU37LlVvfv3zrYHvIvYR5Gy0afURNW94nGulNf JnNXG0z+ExtAlkbWAOTPxSmbxOeGMvQluJq/YkLM9XhxuYxHrlHo6wjjIoRd3sOPMhH0 marxa3jFRjQV6mavrbtmTKG+UqH1RHBRhhVhZ+0CO40nVGTHHfEgdPalLgxfTOmgN70h DEUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460414; x=1790065214; 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=uYw3XH3TVDlWH5yZkMBbor+NJ9bN2wpB4N7ncSus1u4=; b=K0kIczlNICu9Fd7EJNklwls8OmCkA60PJtpdbz8i2fADPo3iZdZov1mMbiBw5cQuxH J4U6ZTXYsAq9s3EVc7dxIrxUVdgWQ1W4ecMpNkJZCnfoOdwVOWnofzA2gskSMrqIDjqp 7w2l9H24tBrIbmB7pk6P1OacsClf3IPG/TCphYyciqHNf0sd4g/+XyDkE1jqHQg9Cvmt 0may+ghuyBuiAYWFQJVEiQlS5icG/qeXeVkGa8RmLVn/+c6IPeNJAmv9JGwCc5AA3UNv GDsy5tJOgpOCX3CTVqam3GbcTmEy1YW97u4b1JDmVM01GRN3RHhlMG9AwJ7I3YHII1IW OXYA== X-Gm-Message-State: AFuF++nqMPb6hrAFLod1sru9uMa8JqNUVK+R8EhewTZetWgkoyNnjwy0 kFHnOfdntsYP2VbBpqf8krj6IMtjyefaOLLJpAvfr93Z+/kBG8qoOrSvhOE4KUSWo5fyGf+9MV1 q06cBo4L02Li4YEyibJc6xi1miy+3/AfygBeOs4rFiqTBD10y/WoUttm7Fk0pYmzFQawwdhq2RY xbQOb56gO4uBcMHauraz6eDZGoS5Ga0xCjSCxRZg== X-Received: from pgap5.prod.google.com ([2002:a63:4205:0:b0:cc4:33fd:a4f7]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6d8a:b0:3db:3e1c:8585 with SMTP id adf61e73a8af0-3db4063b18fmr14587917637.27.1789460412692; Tue, 15 Sep 2026 01:20:12 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:38 +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-22-morbo@google.com> Subject: [PATCH 21/28] NFS: nfsroot: Refactor root_nfs_cat() to use snprintf() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" root_nfs_cat() computes the length of "dest" with strlen(), but then uses up to two strlcat() calls to append a comma separator and "src", rescanning "dest" each time. In preparation for removing the deprecated strlcat() API[1], use the already-computed length and a single snprintf() call to append the optional comma and "src", returning -1 if the result is truncated. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:Claude-3.5-Sonnet [editor_update_file, make_kernel_bui= ld_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 --- fs/nfs/nfsroot.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index 432612d22437..a28208414aec 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -173,12 +173,15 @@ static int __init root_nfs_cat(char *dest, const char= *src, const size_t destlen) { size_t len =3D strlen(dest); + int ret; =20 - if (len && dest[len - 1] !=3D ',') - if (strlcat(dest, ",", destlen) >=3D destlen) - return -1; + if (len >=3D destlen) + return -1; =20 - if (strlcat(dest, src, destlen) >=3D destlen) + ret =3D snprintf(dest + len, destlen - len, "%s%s", + (len && dest[len - 1] !=3D ',') ? "," : "", src); + + if (ret < 0 || ret >=3D destlen - len) return -1; return 0; } --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (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 B5CBE47FB03 for ; Tue, 15 Sep 2026 08:25:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460736; cv=none; b=jbnfzdhe5JWjJzNYnBAsu5yvZo8klEnQlXyI9LhWngWNv5Y2UYiisqfpmKBhGdBRAeGtt1xoGIUl4k4LuhxefGu8KArD3eID/zAdsF8kfKN0fz3/LF52os4Rb8N6gv2SrttGb0ryZU47KoKljBzllKedjTlznA4Geh4In1bfvXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460736; c=relaxed/simple; bh=JbSID6fXeQe1AsKDTvJAsGmW8NhLrp6cj1GLFUVFC9I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KcRGNezdZqxi/Zo72VjAu9BwW5l70Zl8fV3jDpmDXDOtpeHu9jEsa1Al9bwg0OpRcLm0nHbmMFKkgTmVLAi/xy7hQKjBWYQO89qdfdigbjI17vFlHVCgLCI6dJVF2xiYE+Co3KKwYmZJ7Ji/Mn8O3OQQYKLEXwLy4UuIQ8MQ0d8= 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=Z3d43mT9; arc=none smtp.client-ip=209.85.219.69 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="Z3d43mT9" Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-91219341db7so75207966d6.1 for ; Tue, 15 Sep 2026 01:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460734; x=1790065534; 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=6A34g5ncwO0UUCNmS7GYn32h6CG74u/Wx3k3q5PSbh8=; b=Z3d43mT9CfdnitcYQmb6VuZGinfa4GjPFIH4kz4ADCN9ILgOVH4yYr2lcZ16xn7xX/ yQ8GPyE/C0wpp+rS1dVDXT9qe7UFBI+o91FB5s1BRfewa0fIUIIwOgZjRfTXuGVm4gMv 89OWcByXR/mzkCzep+JknjAL788JfBSI7qJ32+2N35vthVAd5VfKkJNpIQcI0xQ2Sk8L pKqmNUfkGaReDQ1Lvp4HZ1P4C6a25Zg11zdTGZxnGVH52wmvcPon5rlSl4PPcpC5qEkn Rsu60As1kfb2ZNDsmRl/c9QC04n+7uumx9pcl/td9MmKwhEtEOZC9DZiq1ge6/RXIAtQ voxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460734; x=1790065534; 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=6A34g5ncwO0UUCNmS7GYn32h6CG74u/Wx3k3q5PSbh8=; b=y2agihaw3xsfswddtBCYeRCD+h3WpYm8ExlJzPR6Yu1gp/CnLf8HO6SIVrJYiv9BNB K38oXZS+lKd625CY1kpK4gFK7VZDb0jRVUbb+0mRGik1vL8ugfiWoG9QdPxN+SRXQpih J2zdRd0WPFMiKfLLT/m2GBWWgh4RNxIBYEer0SnPtsEvPiJt8aHb/qMw5/BRSc0/qri0 o49arL5F0zRTcZ2i0TwAeJIHDWNoKEBR2rFkZpfPks133RAED08hFpswqWzJFm6Hdx4Q pR1Q3QGl43O0MOjJnR8b0kobQG19EL4fJvwj/T1McTxgQFXIoBq8KuxwoAdGBUptQlt2 q9yA== X-Gm-Message-State: AFuF++khsgu4mmY1S27GVmStn8lVMMJv7/vLRc8HEsscwy/D/2wT1nd4 9j4UIZM7FuE6QtZ1qEew40OYId6T7KcVabcEKWb34VDtToLQ+eP3nhUYq7r7nFjqFo6v7SUVqWH LdXGgxwNZFNE/WVvdsWL+CQ7NstCVbxTQMAy7/RUv9jR0z6RoB2CPZB7s0DKbvfmrqbDWftGt72 0Boi1Znhk6IxFK3D28VAJulbPLsnQ79I0fZRexfA== X-Received: from plyw21.prod.google.com ([2002:a17:902:d715:b0:2db:8c06:4fa6]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f712:b0:2db:20fa:9443 with SMTP id d9443c01a7336-2dd6c6db8c2mr126055895ad.13.1789460413607; Tue, 15 Sep 2026 01:20:13 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:39 +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-23-morbo@google.com> Subject: [PATCH 22/28] media: si2165: Use snprintf() to format frontend name 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" si2165_probe() constructs the frontend name by appending the chip name and supported delivery system suffixes (" DVB-T", " DVB-C") to state->fe.ops.info.name using multiple strlcat() calls. In preparation for removing the deprecated strlcat() API[1], format the complete frontend name in a single snprintf() call. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Developer:Gemini [editor_update_file, make_kernel_build_single= _file, shell_command_run] Signed-off-by: Bill Wendling Reviewed-by: Aleksandr Loktionov --- 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 --- drivers/media/dvb-frontends/si2165.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-front= ends/si2165.c index f1241b63aa5c..bd15eb58fc84 100644 --- a/drivers/media/dvb-frontends/si2165.c +++ b/drivers/media/dvb-frontends/si2165.c @@ -1243,20 +1243,17 @@ static int si2165_probe(struct i2c_client *client) chip_name, rev_char, state->chip_type, state->chip_revcode); =20 - strlcat(state->fe.ops.info.name, chip_name, - sizeof(state->fe.ops.info.name)); + snprintf(state->fe.ops.info.name, sizeof(state->fe.ops.info.name), + "Silicon Labs %s%s%s", + chip_name, + state->has_dvbt ? " DVB-T" : "", + state->has_dvbc ? " DVB-C" : ""); =20 n =3D 0; - if (state->has_dvbt) { + if (state->has_dvbt) state->fe.ops.delsys[n++] =3D SYS_DVBT; - strlcat(state->fe.ops.info.name, " DVB-T", - sizeof(state->fe.ops.info.name)); - } - if (state->has_dvbc) { + if (state->has_dvbc) state->fe.ops.delsys[n++] =3D SYS_DVBC_ANNEX_A; - strlcat(state->fe.ops.info.name, " DVB-C", - sizeof(state->fe.ops.info.name)); - } =20 /* return fe pointer */ *pdata->fe =3D &state->fe; --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (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 02F89470E96 for ; Tue, 15 Sep 2026 08:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460474; cv=none; b=DXNk5w2rFqttlSwBwuOF2x3VbpQTGFnGcMgmlLt5Mbc3N3jMcLyGsaFJZ48JQXhmB2oVVDyqQkfy5TpbSIGpp0uKt/7ZCq45JVuvOmGCO+ueZeNIq5IWorB2z1WpAipnB2XtYZMxr8ciazRVDnud7ZoOgINzoNs6SodMBZ8hxaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460474; c=relaxed/simple; bh=Te8HD9YkwxCOhstie9EUJ32KLA4oNHtDIGXeNIM9YkI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=u81TGPhE4Xm5YPQpI4+wEOgYnYfgzuZwqd7zGcGGKJN3g9qOw8PYy60mxGvRoaWDFX0R4ZoEZuF7TYRsyDkeEIEHTpbZb5g+PhQbxOoM4MAU6nlBERXu4ctv6zuLPqX2UzjrhOxqMqYSnaE5QRvuAU9+xHh+jlOq0q1f4Nj1p3w= 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=Sm0elxDu; arc=none smtp.client-ip=209.85.214.200 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="Sm0elxDu" Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2dc7337e2a7so52778455ad.0 for ; Tue, 15 Sep 2026 01:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460415; x=1790065215; 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=aUeRHnlHuLyd8Os/OfUYHyanuI/6gSGpcAdXKzgjG1A=; b=Sm0elxDuTug+KyLI8ny8KqtqtKZOMFIJlmUqfZKZtIGsP/tcONa+VEuplt7dYQpdkN lu0WuWT00yQktV/5O4IVdA7Zx0lZQA2Ex75xJvHUD4V2IWv3s2bVd0xT4DobX/i5tnoJ CI1csADnHX6Jo6vPyKhpWJnfHeucbxAhOzRqOT/6IJJSkynZY7MZvcHGx+isA1UH6OSu rtYGVp3YO4gvXhNNO+mTLWcaINB25AbZJr4RA6acqlUzuzsWqpJRdApHH8giRudU7hdh HXcteOOHe5cQrZwqXeGSuZ+WSd8/XIx8r1HZ/DPV57Zf7jgm1C8WEQw9iCmUv7vOYelq +NFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460415; x=1790065215; 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=aUeRHnlHuLyd8Os/OfUYHyanuI/6gSGpcAdXKzgjG1A=; b=BY1F/Nc7SHXvcIlPovhOAisvamjXMz3N0leIRVKqka4lqPjnrDxFgY41Vda0v6Yx9/ 7kcPYcG7utCtoxkwBzuJf513Gt8ArhRTGRf0aF2wiLZsQSjFZr6/XiKxk4PkmQaJzjIA UQhogBJTDib1384Kz67Wzv7OYV4Ey50uX1UASrocQPz93lHESLTZXl4q0GPb+QEydzji hViBJNcI5Qo/zoIsd6h+FKw6fRhkC1NcxmG1MReOvJUhGa3EY9nccTvhHnTjMIspARo8 v0VY33MoM213ID4LGA8ZuX7+Cu0zifiPFe2xFI/mk5p001RVFjC8JJN8E/fFvimpO3+z ClRw== X-Gm-Message-State: AFuF++kcq8RBVo6xCMuw2zUrZTjB4aJa7psgf48cmRoR8XwaSrW80277 WmHI0yXQooYR5aN1fRXb9PDbnkDdXqpWiegk88vgw6sXc7j/CAYHYmJJJRIaGPvJA91j8vUuleW geyvzl2tFWDewi1HmH7u0ScRRcm1eLlL9q0zco47eJQheWa0q4bp/KPMoKobfduR29H35DF2/4L XdLmGSyPTfcepvrw7BckkhjoauEYsyHX0x2V5zXw== X-Received: from plbmz16.prod.google.com ([2002:a17:903:3510:b0:2dd:2adc:aa80]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:a8b:b0:2d9:26b3:547 with SMTP id d9443c01a7336-2dd83882243mr420135ad.20.1789460414438; Tue, 15 Sep 2026 01:20:14 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:40 +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-24-morbo@google.com> Subject: [PATCH 23/28] Input: synaptics_usb - use seq_buf and snprintf() for name and phys 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" synusb_probe() constructs the device name and physical path using a mix of strscpy(), strlcat(), and snprintf(). In preparation for removing the deprecated strlcat() API[1], use struct seq_buf to incrementally build synusb->name, and format synusb->phys with snprintf() after generating the USB path. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Gemini:1.5-Pro-002 [editor_update_file, make_kernel_build_sing= le_file, test_runner_run_kunit_test] 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 --- drivers/input/mouse/synaptics_usb.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/syna= ptics_usb.c index 880a0c79148c..d13d2d6202ee 100644 --- a/drivers/input/mouse/synaptics_usb.c +++ b/drivers/input/mouse/synaptics_usb.c @@ -41,6 +41,7 @@ #include #include #include +#include =20 #define USB_VENDOR_ID_SYNAPTICS 0x06cb #define USB_DEVICE_ID_SYNAPTICS_TP 0x0001 /* Synaptics USB TouchPad */ @@ -278,6 +279,8 @@ static int synusb_probe(struct usb_interface *intf, struct input_dev *input_dev; unsigned int intf_num =3D intf->cur_altsetting->desc.bInterfaceNumber; unsigned int altsetting =3D min(intf->num_altsetting, 1U); + struct seq_buf s; + char path[64]; int error; =20 error =3D usb_set_interface(udev, intf_num, altsetting); @@ -334,27 +337,29 @@ static int synusb_probe(struct usb_interface *intf, ep->bInterval); synusb->urb->transfer_flags |=3D URB_NO_TRANSFER_DMA_MAP; =20 + seq_buf_init(&s, synusb->name, sizeof(synusb->name)); + if (udev->manufacturer) - strscpy(synusb->name, udev->manufacturer, - sizeof(synusb->name)); + seq_buf_puts(&s, udev->manufacturer); =20 if (udev->product) { if (udev->manufacturer) - strlcat(synusb->name, " ", sizeof(synusb->name)); - strlcat(synusb->name, udev->product, sizeof(synusb->name)); + seq_buf_puts(&s, " "); + seq_buf_puts(&s, udev->product); } =20 - if (!strlen(synusb->name)) - snprintf(synusb->name, sizeof(synusb->name), - "USB Synaptics Device %04x:%04x", - le16_to_cpu(udev->descriptor.idVendor), - le16_to_cpu(udev->descriptor.idProduct)); + if (!seq_buf_used(&s)) + seq_buf_printf(&s, "USB Synaptics Device %04x:%04x", + le16_to_cpu(udev->descriptor.idVendor), + le16_to_cpu(udev->descriptor.idProduct)); =20 if (synusb->flags & SYNUSB_STICK) - strlcat(synusb->name, " (Stick)", sizeof(synusb->name)); + seq_buf_puts(&s, " (Stick)"); =20 - usb_make_path(udev, synusb->phys, sizeof(synusb->phys)); - strlcat(synusb->phys, "/input0", sizeof(synusb->phys)); + seq_buf_str(&s); + + usb_make_path(udev, path, sizeof(path)); + snprintf(synusb->phys, sizeof(synusb->phys), "%s/input0", path); =20 input_dev->name =3D synusb->name; input_dev->phys =3D synusb->phys; --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 A67E846AA94 for ; Tue, 15 Sep 2026 08:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460472; cv=none; b=s1ssLk0FtjaRvu3np1z5yWUhYdV1P8sNQZ7zM7Rrwpj/WhZ70fKyC5PbkTBLpZd0nvA9eCGOFJPbqw3NLXyzFTDqjwlcrsyss0Y9h6nwKbcTRWITTusS3XfzKj80c+Jhl8U+FBorjB1WR/N2maMZIW1vrLsm5U8qZgihw/NXZqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460472; c=relaxed/simple; bh=Uf7uxHQ/vmaAoZCZZPN2XUoRZ9miHwSqTeOUYXKdUpY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tn3yElINF39dsRgly305lVS3SESLkmFA4Y54UX5Y8A44ktb4tKvaiaJz9wSPlDKVmRGsFISPulZLdc4OQYa83rRn92QAmbMKPxuaUi954sLMCVBlKyJgGoZ52UaCPwnCPNurNBRjoh1l9xScICYd48WiPBQT83CJvChvXbwQuaA= 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=PSW2YqEt; arc=none smtp.client-ip=209.85.214.198 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="PSW2YqEt" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2db8e9fe9c7so60583275ad.0 for ; Tue, 15 Sep 2026 01:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460418; x=1790065218; 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=LcsuffwFDxj4u6SThnIq1nFzZdsoWr9GB9tsbe2KVjo=; b=PSW2YqEtNDytBxOIiVQl78Mvkmws4BkKRwtlW7iyLKwotjo6AeZ8N/xocSpLbh5D7+ QFBdYiDmoXtFAckuSfxkSJ8MOM2kZbiJJWbt8y2ORCFiXfBOSy8VliP8pYGPOZp+5ZhU Aq1JeBR0a1lU0WqzEPMveP1x46sCZ/Xzs1O+6HgaWk+eOGjvM3hbeVbhJG7gSnjs8imV j3l5G52OXHtZhuxSoWSiltYRXpZaGIdWpth877O+WG8ilDPbbERWWzShGhTba6uBA8cF FnKHHBmNIXfPyT/yolhtNmLu/qwkt7E06bMCp5NiaOBm5OWaXxBox8XJ3pWF1gqBe7yj QxhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460418; x=1790065218; 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=LcsuffwFDxj4u6SThnIq1nFzZdsoWr9GB9tsbe2KVjo=; b=09YgLXX94ZlxJvg7cjL4GoawKCKacHIeGck3RLm3P+kznYOX5Osojo690s+MSDv8th eDKHqYpZQnA7G45hhtarItIQEmBkEBn/KP6E4WOUHuZAZ2tC6NLp6UpF6VYaWY4fMpvg lKqidplCo23IGieg1spPk7+KmR0LMOGWH0fkMI6CdVNynHe1Wrc1se1RUQ9f1azeWXce Mtpyo30Py/yAeDtP2oMpISQnU/xaYkxa4n3sPVv1hGhhgKvTDj52PEV+LL6Zzrh/Js/O iZSfBVX/jPjPbUvqHewaCSjx6CarZhP3vfj1+V6+EsNTA07FOd272sBz8iurH6ax8dOF h7kQ== X-Gm-Message-State: AFuF++nsMTaSGlMNn7GFPIoK7yPG0WkR673vERiXYv5XCHeyWKPZ8znF rsE0W3pmhxx76wfCcuEZffc3Ww1SIcvHqNwG3DjFUedlMoOvmLqqIQBuJrgQMWv+6Ip2Sj0Ed8r itZGfhvxI2JQqMPocTkcdCJ8e/3OvC+DISSWXfeObKh9g6wTqfkUgVUnsYnfyPAFU4AWJUWJhKn IyE3mwfihpzQ15rzKGmUMhMjVVghaLiio1n5RUtw== X-Received: from plxm10.prod.google.com ([2002:a17:902:db0a:b0:2d9:7bf:6891]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1b50:b0:2db:8ae7:a5d2 with SMTP id d9443c01a7336-2dd6c5f39camr129000865ad.9.1789460415373; Tue, 15 Sep 2026 01:20:15 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:41 +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-25-morbo@google.com> Subject: [PATCH 24/28] EDAC/thunderx: Fix stale error context in thunderx_l2c_threaded_isr() From: Bill Wendling To: linux-kernel@vger.kernel.org Cc: Bill Wendling , 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" thunderx_l2c_threaded_isr() computes "tail" and "ctx" once before entering the loop that drains the L2C error ring, and never updates them on subsequent iterations. When multiple errors are queued, every iteration reports the first ring entry rather than advancing through the ring, causing subsequent hardware errors in a batch to go unreported. Recompute "tail" and "ctx" at the start of each loop iteration, matching the sibling thunderx_ocx_com_threaded_isr() and thunderx_ocx_lnk_threaded_isr() handlers. Fixes: 41003396f932 ("EDAC, thunderx: Add Cavium ThunderX EDAC driver") Signed-off-by: Bill Wendling Reviewed-by: Aleksandr Loktionov --- 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 --- drivers/edac/thunderx_edac.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index 9c0a1e48f96f..e7c335ca0c36 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -1880,6 +1880,9 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq,= void *irq_id) =20 while (CIRC_CNT(l2c->ring_head, l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx))) { + tail =3D ring_pos(l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx)); + ctx =3D &l2c->err_ctx[tail]; + snprintf(msg, L2C_MESSAGE_SIZE, "%s: %s: %016llx, %s: %016llx", l2c->edac_dev->ctl_name, reg_int_name, ctx->reg_int, --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (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 1A59F492513 for ; Tue, 15 Sep 2026 08:26:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460813; cv=none; b=YkkJeu4qVyoINjcNT4sLWa58xRyqTkWi/jpuNzs6C/4Kmb04ukstWpXIljtJrMud6s3QIo6zZ76pmQ9aHZXWf4U5Xzb21yFP/tplffqMNN8HGd8e6NShrgZ5Ap98jr8LWz1uNprFBv9JVqT1NsVWDqXOQ3X+XmSdlXVb7p/SyMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460813; c=relaxed/simple; bh=F9i32u7X67i3rjTFL62V2TeKyR+ixZjqL6I2EccGRRA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=eoVhfiS6TZb4H8vYJIZR3YBpwjIfvIPJSmDByHXUQvFrof1XuPE4l/nDLjHNEShbWDxX1YPZMkohgYthkxbtO8WgBGLls7tjrWu4MJadQHZdYNfpjTitFigElgS9XjW/LA13+cGUw9gk5I9oI+tk0PVfi2AsOHOfmzloPI2AITk= 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=TigrlvK/; arc=none smtp.client-ip=209.85.222.199 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="TigrlvK/" Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-9308eafb465so1085980685a.2 for ; Tue, 15 Sep 2026 01:26:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460810; x=1790065610; 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=CSHzy5Fr+v+g78gtgBhpLtU/5VBe17dtS9vTkuvViHg=; b=TigrlvK/QTYzC30aaMDr1gr52YhSkHL9GYV0QvgGzO8Ah1o3Es5OiQjR7TSL8bBeSa UAciVZeX2GOfgqZErYslcWlPLF6MOYYPmRtbE9srstkDXclOI7hhqU6cAo7HtooZqDKW NSuwjhU/2iwk6TJXo5xlzgoZw+6ossvOyH1jo+sTxNn+6G8zIT9HnX+59mhFtg9lsNvv 0C5gW/ApvYHcGPY6kyp3sH7Dcjj5i6ZiWJtxnSvPWtfyfZ3xrkyEtg/P1wKdQRP18Fqk 1KYzbBoGlnaOXqUS5En5ItaxvS6mjTcU7TfqSJahZKdlN4QOvz4TG07wZlolfIIViysc ierA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460810; x=1790065610; 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=CSHzy5Fr+v+g78gtgBhpLtU/5VBe17dtS9vTkuvViHg=; b=vGhP7IQBjC42m5EYoRJTYkt7Si+PMD9YyxC4zqH1bAf/rqIJoVMjoLJicvYw96ro7z CxzkjAVHUfLJciLgYqNYcFRi60bfQu4M5NqigGEJ/NCkrJG+jNEa4QdVCTO1FGCjy0E7 T8Xz1ejzhSGbK7DUCZgDoOIHTwmvkH5vwKnixV7tzKSrSMscfiLorVs++0dpG22uU00a nWmR+1ddnPEpojTbsdyVPQeZZyizIXaZn/gqdn6icCeQ2pu4j2xDnkz4NhJXJg4NNf6G SbXWty3aTum97gfQgmxkQp2KuhhkG0R3eUtXZsDI2gmoxI8jMfyFCrY0lLGTrJAGRcSo qU3g== X-Gm-Message-State: AFuF++mHremVFkeEgHlp0NiO7Q0QULZH4hTjHaKef2AlWdDItNNMEooQ 55T/W3kiOnSWlQ39yw2cKuogEJQFVTd9mWoIbtU3AEB1CEqwr8iBVCmDg1u8BBgUo3fYpnzb9rH MrVVDGSBMgJEkOF2IPlT0CI4EPlKnF5vSqjOuoxWMjnRBOrPOruxFyoyLhFsMTXVxz5/ppfCh4D /jHjYr36mmlBerRonDm5MXiVJauyRRTXetqATevQ== X-Received: from plky9.prod.google.com ([2002:a17:902:7009:b0:2dd:3c92:b0a2]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:8c5:b0:2c6:90ec:f601 with SMTP id d9443c01a7336-2dd6c5f3422mr125997365ad.8.1789460416594; Tue, 15 Sep 2026 01:20:16 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:42 +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-26-morbo@google.com> Subject: [PATCH 25/28] EDAC/thunderx: Replace strlcat() with seq_buf 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The threaded ISR handlers (thunderx_ocx_com_threaded_isr(), thunderx_ocx_lnk_threaded_isr(), and thunderx_l2c_threaded_isr()) build multi-line error reports by formatting register details into a scratch buffer and appending them to "msg" with strlcat(). In preparation for removing the deprecated strlcat() API[1], refactor the ISR handlers to construct error messages using struct seq_buf. Additionally, fix two bugs in decode_register(): initialize "str[0] =3D '\0= '" so callers do not append stale buffer contents when no error bits match, and stop iterating if snprintf() truncates the buffer to avoid underflowing the remaining "size" counter. Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: AI:Claude-3-5-Sonnet [editor_update_file, shell_command_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 --- drivers/edac/thunderx_edac.c | 64 ++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c index e7c335ca0c36..4e3781815b6d 100644 --- a/drivers/edac/thunderx_edac.c +++ b/drivers/edac/thunderx_edac.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include =20 @@ -47,12 +48,17 @@ static void decode_register(char *str, size_t size, { int ret =3D 0; =20 + if (size > 0) + str[0] =3D '\0'; + while (descr->type && descr->mask && descr->descr) { if (reg & descr->mask) { ret =3D snprintf(str, size, "\n\t%s, %s", descr->type =3D=3D ERR_CORRECTED ? "Corrected" : "Uncorrected", descr->descr); + if (ret < 0 || ret >=3D size) + break; str +=3D ret; size -=3D ret; } @@ -1115,35 +1121,37 @@ static irqreturn_t thunderx_ocx_com_threaded_isr(in= t irq, void *irq_id) =20 while (CIRC_CNT(ocx->com_ring_head, ocx->com_ring_tail, ARRAY_SIZE(ocx->com_err_ctx))) { + struct seq_buf s; + tail =3D ring_pos(ocx->com_ring_tail, ARRAY_SIZE(ocx->com_err_ctx)); ctx =3D &ocx->com_err_ctx[tail]; =20 - snprintf(msg, OCX_MESSAGE_SIZE, "%s: OCX_COM_INT: %016llx", - ocx->edac_dev->ctl_name, ctx->reg_com_int); + seq_buf_init(&s, msg, OCX_MESSAGE_SIZE); + + seq_buf_printf(&s, "%s: OCX_COM_INT: %016llx", + ocx->edac_dev->ctl_name, ctx->reg_com_int); =20 decode_register(other, OCX_OTHER_SIZE, ocx_com_errors, ctx->reg_com_int); =20 - strlcat(msg, other, OCX_MESSAGE_SIZE); + seq_buf_puts(&s, other); =20 for (lane =3D 0; lane < OCX_RX_LANES; lane++) if (ctx->reg_com_int & BIT(lane)) { - snprintf(other, OCX_OTHER_SIZE, - "\n\tOCX_LNE_INT[%02d]: %016llx OCX_LNE_STAT11[%02d]: %016llx", - lane, ctx->reg_lane_int[lane], - lane, ctx->reg_lane_stat11[lane]); - - strlcat(msg, other, OCX_MESSAGE_SIZE); + seq_buf_printf(&s, + "\n\tOCX_LNE_INT[%02d]: %016llx OCX_LNE_STAT11[%02d]: %016llx", + lane, ctx->reg_lane_int[lane], + lane, ctx->reg_lane_stat11[lane]); =20 decode_register(other, OCX_OTHER_SIZE, ocx_lane_errors, ctx->reg_lane_int[lane]); - strlcat(msg, other, OCX_MESSAGE_SIZE); + seq_buf_puts(&s, other); } =20 if (ctx->reg_com_int & OCX_COM_INT_CE) - edac_device_handle_ce(ocx->edac_dev, 0, 0, msg); + edac_device_handle_ce(ocx->edac_dev, 0, 0, seq_buf_str(&s)); =20 ocx->com_ring_tail++; } @@ -1196,25 +1204,28 @@ static irqreturn_t thunderx_ocx_lnk_threaded_isr(in= t irq, void *irq_id) =20 while (CIRC_CNT(ocx->link_ring_head, ocx->link_ring_tail, ARRAY_SIZE(ocx->link_err_ctx))) { + struct seq_buf s; + tail =3D ring_pos(ocx->link_ring_head, ARRAY_SIZE(ocx->link_err_ctx)); =20 ctx =3D &ocx->link_err_ctx[tail]; =20 - snprintf(msg, OCX_MESSAGE_SIZE, - "%s: OCX_COM_LINK_INT[%d]: %016llx", - ocx->edac_dev->ctl_name, - ctx->link, ctx->reg_com_link_int); + seq_buf_init(&s, msg, OCX_MESSAGE_SIZE); + + seq_buf_printf(&s, "%s: OCX_COM_LINK_INT[%d]: %016llx", + ocx->edac_dev->ctl_name, + ctx->link, ctx->reg_com_link_int); =20 decode_register(other, OCX_OTHER_SIZE, ocx_com_link_errors, ctx->reg_com_link_int); =20 - strlcat(msg, other, OCX_MESSAGE_SIZE); + seq_buf_puts(&s, other); =20 if (ctx->reg_com_link_int & OCX_COM_LINK_INT_UE) - edac_device_handle_ue(ocx->edac_dev, 0, 0, msg); + edac_device_handle_ue(ocx->edac_dev, 0, 0, seq_buf_str(&s)); else if (ctx->reg_com_link_int & OCX_COM_LINK_INT_CE) - edac_device_handle_ce(ocx->edac_dev, 0, 0, msg); + edac_device_handle_ce(ocx->edac_dev, 0, 0, seq_buf_str(&s)); =20 ocx->link_ring_tail++; } @@ -1880,22 +1891,25 @@ static irqreturn_t thunderx_l2c_threaded_isr(int ir= q, void *irq_id) =20 while (CIRC_CNT(l2c->ring_head, l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx))) { + struct seq_buf s; + tail =3D ring_pos(l2c->ring_tail, ARRAY_SIZE(l2c->err_ctx)); ctx =3D &l2c->err_ctx[tail]; =20 - snprintf(msg, L2C_MESSAGE_SIZE, - "%s: %s: %016llx, %s: %016llx", - l2c->edac_dev->ctl_name, reg_int_name, ctx->reg_int, - ctx->reg_ext_name, ctx->reg_ext); + seq_buf_init(&s, msg, L2C_MESSAGE_SIZE); + + seq_buf_printf(&s, "%s: %s: %016llx, %s: %016llx", + l2c->edac_dev->ctl_name, reg_int_name, ctx->reg_int, + ctx->reg_ext_name, ctx->reg_ext); =20 decode_register(other, L2C_OTHER_SIZE, l2_errors, ctx->reg_int); =20 - strlcat(msg, other, L2C_MESSAGE_SIZE); + seq_buf_puts(&s, other); =20 if (ctx->reg_int & mask_ue) - edac_device_handle_ue(l2c->edac_dev, 0, 0, msg); + edac_device_handle_ue(l2c->edac_dev, 0, 0, seq_buf_str(&s)); else if (ctx->reg_int & mask_ce) - edac_device_handle_ce(l2c->edac_dev, 0, 0, msg); + edac_device_handle_ce(l2c->edac_dev, 0, 0, seq_buf_str(&s)); =20 l2c->ring_tail++; } --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (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 25AB54A2A50 for ; Tue, 15 Sep 2026 08:28:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460899; cv=none; b=NNqJq3Jno4bS0EnJSt6SKtzUgZGh83BnVihYNkj/cVjbBHECl7VKzuhlXe12TPMCRJvCwCV7BDiLu1ELKAZvTrXoTSUTrO/U2NMo9MpgTFYUIwTgSqHE/35/+EWK+zr4XrpCrr9WMtMZtRSacM+NBCiSEQPEzUYcra6U+mxhy6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460899; c=relaxed/simple; bh=7ISDVBxGmgeCdxhmRRdB69cX7Bxvnv7xpoH47YwrzBI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gHEC43VAWmljuDAlBQ52kzh10fZGFeGeqPaTdeA1PKvd8OknK2y8CmUjgFPlcW/u1qpXUZpcTWi6Vz3yyGFMwk6AyMAulrvYxyscZFLK3MBjLPE2ifNhiiNdsNP3JzKr82rwzRP9gdr539eS4jk0tE8LBnYaDa3CbysOsjHI7KM= 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=ZMSpkrhp; arc=none smtp.client-ip=209.85.214.198 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="ZMSpkrhp" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2d6f75c1219so88269965ad.3 for ; Tue, 15 Sep 2026 01:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460896; x=1790065696; 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=Yp7aMeBt5kbv9wDm9MP1w/VhRzf84I2dhiWVAxjsG5I=; b=ZMSpkrhpTaDKjUCkzmdzw2YuEs3Ii5gyDfpuW5gtR9ISOIYHqcm+TtQktTPfL7akG1 kr/Z2OG1exgbs0QogZpUaFBm9nI9LJuEfKgvgswIqd10yY01lLMeNadDpZJpEcdDuqbv WWNFoX2Tn5eRm41val2+FdX/YFgkcO20jGgTMVcTKyZselSwfYMRfNjUOlzHZnloptOy Pt1TLlbUqk0pnQwKjZZY1yKn321rD86SXjiMY1jU5Ej+/xsAO8NtNIr9R+jPy4sNmpNb vJuNRiG92d3qh0KVOZuwNphvdGdwa52yU5Z+5OBzCZO0srkkRhHYlzArdzAwONXSBqof xO4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460896; x=1790065696; 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=Yp7aMeBt5kbv9wDm9MP1w/VhRzf84I2dhiWVAxjsG5I=; b=UYdO5Hp7LJLhJwmytyfaLu9vronYqlYKP4J3B/U4zITnneO1TTorLVmnreNs89htAV LNq4KtQY2Eyz9PZQqPoacC6QX8Dv6obHR8dJAzy6ezisUykgBKc9W9Q3OmxRjYmTSYn1 tF86dpBKVOgS/bJNjGOj3HbNA+SbKqdTQ52S84iwJ5FAMa+Zlkq1DGD/Q9iIV7aBfeiJ YGoFd7Q3loGU/0AKt7q7mFZ1fROLpHMuoqx7Ye+CM+x9ZPIyQyLOhUrVXDKzY/1Sva4E oyyk32owmJSQiIVQYM/oE6xx4lMURI6SwkKDwAKK6f3fwXPvnZzGDdbeAUhmRso52I3r CJEA== X-Gm-Message-State: AFuF++nfCFbYXdXJ5OWKdT9d6WdkqRzkUqbHzryG89zQ964e8JWO7K+b 1WCvGVsMnGNuhP34I2sCgvYqvZxH/Vnn9vYxFVU3Bc92C08ZA0fgeIuy+bKdPizCZyLVJDBfR8b ecbzqinJAdR/MkK7/MJ7xVkQn/8b1Bfm0gcWLVzNxjm0sv1YiLyXId/i4DMcHXvn58NYOBy0XTn dp9xWv0YrfCBsAbH8fz+cpYxfWhDPATbwO5fTYAg== X-Received: from pltt2.prod.google.com ([2002:a17:902:d142:b0:2dd:5303:f006]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f64f:b0:2dd:278c:5eb with SMTP id d9443c01a7336-2dd83851f4amr602125ad.14.1789460417430; Tue, 15 Sep 2026 01:20:17 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:43 +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-27-morbo@google.com> Subject: [PATCH 26/28] wifi: wil6210: Refactor resume_triggers2string() to use seq_buf 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" resume_triggers2string() builds a space-separated string of active resume trigger names using a series of conditional strlcat() calls. In preparation for removing the deprecated strlcat() API[1], replace the strlcat() calls with struct seq_buf and seq_buf_puts(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoPilot:1.0 [editor_update_file, make_kernel_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 --- drivers/net/wireless/ath/wil6210/wmi.c | 38 ++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/= ath/wil6210/wmi.c index 479b2418ca34..fcc9e9eb5732 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c @@ -7,6 +7,7 @@ #include #include #include +#include =20 #include "wil6210.h" #include "txrx.h" @@ -3162,27 +3163,30 @@ int wmi_suspend(struct wil6210_priv *wil) =20 static void resume_triggers2string(u32 triggers, char *string, int str_siz= e) { - string[0] =3D '\0'; + struct seq_buf s; + + seq_buf_init(&s, string, str_size); =20 if (!triggers) { - strlcat(string, " UNKNOWN", str_size); - return; + seq_buf_puts(&s, " UNKNOWN"); + } else { + if (triggers & WMI_RESUME_TRIGGER_HOST) + seq_buf_puts(&s, " HOST"); + + if (triggers & WMI_RESUME_TRIGGER_UCAST_RX) + seq_buf_puts(&s, " UCAST_RX"); + + if (triggers & WMI_RESUME_TRIGGER_BCAST_RX) + seq_buf_puts(&s, " BCAST_RX"); + + if (triggers & WMI_RESUME_TRIGGER_WMI_EVT) + seq_buf_puts(&s, " WMI_EVT"); + + if (triggers & WMI_RESUME_TRIGGER_DISCONNECT) + seq_buf_puts(&s, " DISCONNECT"); } =20 - if (triggers & WMI_RESUME_TRIGGER_HOST) - strlcat(string, " HOST", str_size); - - if (triggers & WMI_RESUME_TRIGGER_UCAST_RX) - strlcat(string, " UCAST_RX", str_size); - - if (triggers & WMI_RESUME_TRIGGER_BCAST_RX) - strlcat(string, " BCAST_RX", str_size); - - if (triggers & WMI_RESUME_TRIGGER_WMI_EVT) - strlcat(string, " WMI_EVT", str_size); - - if (triggers & WMI_RESUME_TRIGGER_DISCONNECT) - strlcat(string, " DISCONNECT", str_size); + seq_buf_str(&s); } =20 int wmi_resume(struct wil6210_priv *wil) --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) (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 9494B476CF7 for ; Tue, 15 Sep 2026 08:20:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460488; cv=none; b=lOZLnyov2Ag/HCHE9buu0Md7PKPH8x/UPrvPo9Fyk2D1FtQUyz2CYJEglqgsYSTm7NJiGNlYZxy8PfvD7JYu/NiwoImZxa92Eet5uOZQnN7M64hlB7Qi9gh1Tv3ufFC4pjCwAqONzsILRNcXQ5B95LyN3NHgsJQWJpZn6tm+R9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460488; c=relaxed/simple; bh=RwAdEk8GoMG+Ylv02Q78v2tXMpN+9oITjoSVCa+/lcI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GhUrXRblJoMennfF+FO0kF3Ze4xEtcGngV6nNYfaWHmyud9b/dg/0O6NC3IHhQOub2TAe+NTUCr3dXJGPtJB6qrYt/LWHp3AIllP1aUIe6o8Ojh/u1avjj1ol4wUT4iHwoMsl9OyyFS9QQtF7fu6IemNXeb4Jctz+wLysDx2c+g= 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=KmARG9aJ; arc=none smtp.client-ip=209.85.215.200 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="KmARG9aJ" Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cc132709c76so5389694a12.3 for ; Tue, 15 Sep 2026 01:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460419; x=1790065219; 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=3R1bHblX/YSNAoDVuSots2jijK47BJf7ndWg1gXSC20=; b=KmARG9aJw+EfrxjNpwdI07LN4CIXUR8sFQ6kkwPFhACadzvxbNPSIDqr//33Alc4UY R52INMML5LN0aTuN8HjZxDuM76h1AAPcVXn64yUT5rjit5U+iGgl1MF/BPOb2cuiZPyE Wv+fQiUqjwl3D7XanEH4V1189fAZLMrNUiH5L4sX194GyKiZUpMsh1fcaGDV5CYbubY9 zj839tWYTRKD3DVNfwMII7er+yQ1vrEDArJ2YZCq2Nc1++mCm4429OPTjsrTlmItPsPN +wzv3LuzLp959vh3m2lMJbDvEUvDqQ7gTJ7C0wDgVReew1uK7PhFLz5ZO2mKQArH31TA dF6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460419; x=1790065219; 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=3R1bHblX/YSNAoDVuSots2jijK47BJf7ndWg1gXSC20=; b=gybWXn8ckWMhnGVmwHwOJzn/GF4zD7dpKA0pbPp2EzKd7zz806Edg3d/ZekUIj2ArI 1oHTCpEOl2871xt3GwifUq5MG+6LDmydIMvosUDjmXpw5FMGh/NizNda6APMx/aE0J2o CYV5tKiCgRureQq/l7CbrmzxYpHE+09iFMnOk76vtDHHayHMrG0bBZmTReJpsU2GMqsA FhTiZ15YtaOaGf+SllZtkCoyxgbLxHIqAlypNXkcS6iMUQK5PfVXW6V/kJeF9uUJ2/Sc 8jYsFqA3pNLz/8AqGCd1F97vf4SI05ewkAs5SY/B7ilvIXMcOMt+YF3dKadheDAbtuP1 M1OA== X-Gm-Message-State: AFuF++lAxcgKKch9rM5u5zIYd3kl7GZbqyqcikKJzPtUIOaPwvqIL6RP /fmIk5/7E0zkphwmtHHUHHwObij/+Ky33NaQLqrIjPIj1TA1ojWLerok/J8fGRnq0kBNdVQaXFj DPmq359wkoAwBG8FUuHimiODUBH4Eq+RZMWDFDSAmbVeebNCx4vBgLDPSWDylYBkX2gSPr0SfZw F74NynYmf4n5ns/hZWYNlB1RdHBXf3uD9oGN85XA== X-Received: from pghu21.prod.google.com ([2002:a63:ef15:0:b0:cc4:da05:ef4c]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:3315:b0:3d3:aec2:4dcd with SMTP id adf61e73a8af0-3db40623e61mr13262094637.25.1789460418341; Tue, 15 Sep 2026 01:20:18 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:44 +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-28-morbo@google.com> Subject: [PATCH 27/28] drm/xe/pf: Convert strlcat() to seq_buf in control_read() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" control_read() builds a list of supported SR-IOV VF control commands in a stack buffer by calling strlcat() twice per command in a loop. In preparation for removing the deprecated strlcat() API[1], use struct seq_buf and seq_buf_printf() to format each command line and pass seq_buf_used() directly to simple_read_from_buffer(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: CoT-Agent:Gemini-2.0-Flash [editor_update_file, shell_command_= 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 --- drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c b/drivers/gpu/drm/= xe/xe_gt_sriov_pf_debugfs.c index 0f242db775e1..5db7fc067c4d 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c @@ -4,6 +4,7 @@ */ =20 #include +#include =20 #include #include @@ -663,15 +664,15 @@ static ssize_t control_write(struct file *file, const= char __user *buf, size_t c static ssize_t control_read(struct file *file, char __user *buf, size_t co= unt, loff_t *ppos) { char help[128]; + struct seq_buf s; size_t n; =20 - help[0] =3D '\0'; + seq_buf_init(&s, help, sizeof(help)); for (n =3D 0; n < ARRAY_SIZE(control_cmds); n++) { - strlcat(help, control_cmds[n].cmd, sizeof(help)); - strlcat(help, "\n", sizeof(help)); + seq_buf_printf(&s, "%s\n", control_cmds[n].cmd); } =20 - return simple_read_from_buffer(buf, count, ppos, help, strlen(help)); + return simple_read_from_buffer(buf, count, ppos, help, seq_buf_used(&s)); } =20 static const struct file_operations control_ops =3D { --=20 2.55.0.1032.g73a4cd73de-goog From nobody Fri Sep 25 07:55:59 2026 Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.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 0501F4A0938 for ; Tue, 15 Sep 2026 08:27:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460854; cv=none; b=ZQK1ZiuA45GpN3WEw8pz540pQSf15LB5ymjEdU5srLQMQfFZKxDJTRXI0z9Mt0dm4VYlyKSaimdDQiIEQDCidEDjc9Q6/Lzurc2X5f84obki7Cd6IZ7ed8kBWKnGU/4KHEbOD/tZR/vxgU2AxaDTFz0gKiRObPsY/pRLFPap3OU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460854; c=relaxed/simple; bh=WLXzasjY0mBK/NrbpJfTCOFtGklzxJ8+ta6QqRZkwNM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bpCi3PYQqFp7LzpdEK2446tLaU7i0QGxKVYFJTIBeBdUnrH3oLWdyAplZ1M46bM86lWFn6+wadfHwEfsaf3X5N0otPoo/7nln51fStcOJ7DjuJ5AtudVUNqJzxyRlwAR6398tl09jgDjjvtzKDcZ3cZS9v5+wfa+dbDnBM4gW18= 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=ABYdo4RB; arc=none smtp.client-ip=209.85.217.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="ABYdo4RB" Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-7866c4ed349so3748900137.0 for ; Tue, 15 Sep 2026 01:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789460851; x=1790065651; 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=RYxDJLbbwpCoc34IeHntB/eNfLB4EmZZnrz8tORBuFs=; b=ABYdo4RBG2ZmptvlGxRDxUUy/g4NQCosh9cjApgRIEyfEkPzxdCxI1KO9EsoQ3RpCF ocMhm08n7dI1Y2t7wi4QWs92EyKoMLQI9u9ENLYnz4DzJMAt/zaL5H10nc93fX5Ddoql djiVU6ZQ8qxO6kxl9gY/pfd3vyeRMS6zRxoaI1mDAEPjbc0Md288vjQXqmT7VzomGFJ0 vLsYCG0mVK119B4Nzw7znaLkP3FLIr+nee7+g32GCS9HHkd2J9gnuLLEP7DHEU8ReMYO ue4FUJBUh/3RSB4lInkUe6SIJsxqicymTyoJZijUCP1vrUwQ5H1feSB+rqMK50+BqNYD 0/nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460851; x=1790065651; 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=RYxDJLbbwpCoc34IeHntB/eNfLB4EmZZnrz8tORBuFs=; b=EG1g91O4fqP4kikFVbdyM2Jq6i5gllHQtw9yt82lpmLx+MylsQcVoFVSJpUpjsA5fn ukzyZzU4iebc4Be99o0TmwNYctmPjHlyzICGs15e9+kAjv/8XoVOlQz7kbAs5e/TC3ZW fWz10PnCKVDWQPLztnUdFIGHX71+RHMr//2NWav1DPPpTUJoXs7QN6RGhx0cFK4nFciz 4qxZ+z2bCNAPPSTmHrSIxPCBuf9Z5Lfo8z7uwVYFzaFRiFWdrl63kafpCjk+UH4O7CX1 II9ozda2r3YVOjXrwQN2M9aA+Lnunz2d3GPiS3URAjmC1LfAUETloZVn71NjQ8/RHEVx Kunw== X-Gm-Message-State: AFuF++ky5xGM37ONWYdmc1gPIyoRj9We5S7c32EG8ATg9rT7CJZIH7Q0 y2Cwb/mMaUSJ6QaTmu+qpoSWC+al28fQx6zaM9aKsCzrc/JqNiTvascEj6SoWsUH6EfQrqVLVI9 c1GUCguB4VX0FQGWHyXTQhM55eFZRBkApNsGF2+kR53QVt7Pvdjb/6kkYruz30pTiIj6AqpJU8o 9uHUK7qDKNjgTEbLZn70a5dNT57VuuW7vECo9eUg== X-Received: from plas19.prod.google.com ([2002:a17:903:2013:b0:2dd:75f1:13f5]) (user=morbo job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:40c6:b0:2d0:cc92:f7a9 with SMTP id d9443c01a7336-2dd837a6aeemr1077095ad.4.1789460419151; Tue, 15 Sep 2026 01:20:19 -0700 (PDT) Date: Tue, 15 Sep 2026 08:18:45 +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-29-morbo@google.com> Subject: [PATCH 28/28] drm/xe/pf: Refactor strlcat() to seq_buf in sched_group_engines_read() 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Similar to control_read(), sched_group_engines_read() constructs a space-separated list of hardware engine names in a stack buffer using repeated strlcat() calls inside a loop. In preparation for removing the deprecated strlcat() API[1], refactor sched_group_engines_read() to use struct seq_buf and seq_buf_printf(). Link: https://github.com/KSPP/linux/issues/370 [1] Cc: codemender-patching+linux@google.com Assisted-by: Developer:Gemini [editor_update_file, make_kernel_build_single= _file, shell_command_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 --- drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c b/drivers/gpu/drm/= xe/xe_gt_sriov_pf_debugfs.c index 5db7fc067c4d..548a50f74422 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c @@ -377,8 +377,10 @@ static ssize_t sched_group_engines_read(struct file *f= ile, char __user *buf, struct xe_hw_engine *hwe; enum xe_hw_engine_id id; char engines[128]; + struct seq_buf s; + const char *s_str; =20 - engines[0] =3D '\0'; + seq_buf_init(&s, engines, sizeof(engines)); =20 if (group < num_groups) { for_each_hw_engine(hwe, gt, id) { @@ -386,15 +388,14 @@ static ssize_t sched_group_engines_read(struct file *= file, char __user *buf, u16 guc_logical_instance =3D xe_hwe_guc_logical_instance(hwe); u32 mask =3D groups[group].engines[guc_class]; =20 - if (mask & BIT(guc_logical_instance)) { - strlcat(engines, hwe->name, sizeof(engines)); - strlcat(engines, " ", sizeof(engines)); - } + if (mask & BIT(guc_logical_instance)) + seq_buf_printf(&s, "%s ", hwe->name); } - strlcat(engines, "\n", sizeof(engines)); + seq_buf_puts(&s, "\n"); } =20 - return simple_read_from_buffer(buf, count, ppos, engines, strlen(engines)= ); + s_str =3D seq_buf_str(&s); + return simple_read_from_buffer(buf, count, ppos, s_str, strlen(s_str)); } =20 static const struct file_operations sched_group_engines_fops =3D { --=20 2.55.0.1032.g73a4cd73de-goog