[PATCH 05/28] ALSA: usb-audio: Refactor usb_audio_make_longname() to use seq_buf
From: Bill Wendling <morbo@google.com>
Date: 2026-09-15 08:19:58
Also in:
dri-devel, intel-wired-lan, intel-xe, linux-devicetree, linux-gpio, linux-hardening, linux-input, linux-media, linux-mips, linux-nfs, linux-samsung-soc, linux-scsi, linux-sound, linux-wireless, lkml, loongarch, netdev
Subsystem:
sound, the rest · Maintainers:
Jaroslav Kysela, Takashi Iwai, Linus Torvalds
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 <morbo@google.com> --- Cc: Russell King <linux@armlinux.org.uk> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: WANG Xuerui <kernel@xen0n.name> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: Thomas Gleixner <tglx@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: David Airlie <airlied@gmail.com> Cc: Simona Vetter <simona@ffwll.ch> Cc: Matthew Brost <matthew.brost@intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Matthias Schwarzott <zzam@gentoo.org> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Tony Nguyen <anthony.l.nguyen@intel.com> Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com> Cc: Andrew Lunn <andrew+netdev@lunn.ch> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Arend van Spriel <arend.vanspriel@broadcom.com> Cc: Rob Herring <robh@kernel.org> Cc: Saravana Kannan <saravanak@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Cc: Peter Griffin <peter.griffin@linaro.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: Linus Walleij <linusw@kernel.org> Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com> Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com> Cc: "Martin K. Petersen" <mkp@kernel.org> Cc: Trond Myklebust <trondmy@kernel.org> Cc: Anna Schumaker <anna@kernel.org> Cc: Mike Marshall <hubcap@omnibond.com> Cc: Martin Brandenburg <martin@omnibond.com> Cc: Kees Cook <kees@kernel.org> Cc: Jiri Pirko <jiri@resnulli.us> Cc: Simon Horman <horms@kernel.org> Cc: Chuck Lever <cel@kernel.org> Cc: Jeff Layton <jlayton@kernel.org> Cc: NeilBrown <neil@brown.name> Cc: Olga Kornievskaia <okorniev@redhat.com> Cc: Dai Ngo <Dai.Ngo@oracle.com> Cc: Tom Talpey <tom@talpey.com> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: Bill Wendling <morbo@google.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: "Mike Rapoport (Microsoft)" <rppt@kernel.org> Cc: Kanglong Wang <redacted> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Qiang Ma <redacted> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Pengpeng Hou <redacted> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: Breno Leitao <leitao@debian.org> Cc: Thorsten Blum <blum@kernel.org> Cc: Harshit Mogalapalli <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Lyude Paul <lyude@redhat.com> Cc: Ashutosh Desai <redacted> Cc: Imre Deak <redacted> Cc: Dmitry Baryshkov <redacted> Cc: Johan Hovold <johan@kernel.org> Cc: Johannes Berg <redacted> Cc: Miri Korenblit <miriam.rachel.korenblit@intel.com> Cc: Alexander Stein <redacted> Cc: Cryolitia PukNgae <cryolitia@uniontech.com> Cc: Jiaming Zhang <redacted> Cc: Will Porter <redacted> Cc: Cen Zhang <redacted> Cc: "Cássio Gabriel" <redacted> Cc: Rong Zhang <redacted> Cc: Arun Raghavan <redacted> 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 <linux/list.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/seq_buf.h> #include <linux/ctype.h> #include <linux/usb.h> #include <linux/moduleparam.h>
@@ -651,7 +652,9 @@ static void usb_audio_make_longname(struct usb_device *dev, struct snd_card *card = chip->card; const struct usb_audio_device_name *preset; const char *s = NULL; - int len; + struct seq_buf sb; + char *buf; + size_t size; preset = lookup_device_name(chip->usb_id);
@@ -667,44 +670,61 @@ static void usb_audio_make_longname(struct usb_device *dev, s = preset->vendor_name; else if (quirk && quirk->vendor_name) s = quirk->vendor_name; - *card->longname = 0; - if (s && *s) - strscpy(card->longname, s); - else if (dev->manufacturer && *dev->manufacturer) - strscpy(card->longname, dev->manufacturer); - 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 = strim(card->longname); + if (trimmed != card->longname) + memmove(card->longname, trimmed, strlen(trimmed) + 1); + sb.len = strlen(card->longname); + if (sb.len) + seq_buf_putc(&sb, ' '); } - strlcat(card->longname, card->shortname, sizeof(card->longname)); + seq_buf_puts(&sb, card->shortname); - len = strlcat(card->longname, " at ", sizeof(card->longname)); + seq_buf_puts(&sb, " at "); - if (len < sizeof(card->longname)) - usb_make_path(dev, card->longname + len, sizeof(card->longname) - len); + size = seq_buf_get_buf(&sb, &buf); + if (size > 0) { + int path_len = usb_make_path(dev, buf, size); + + if (path_len >= 0) + seq_buf_commit(&sb, path_len); + else + seq_buf_set_overflow(&sb); + } 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); } static void snd_usb_init_quirk_flags(int idx, struct snd_usb_audio *chip)
--
2.55.0.1032.g73a4cd73de-goog