From mboxrd@z Thu Jan 1 00:00:00 1970 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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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