From mboxrd@z Thu Jan 1 00:00:00 1970 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 F10EA3B42EF 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=1789460464; cv=none; b=RfusRB5C6Ta2Ka7ezHGO49oyz/luaRz0oAMh5KUUCypx6e4rH4IHdkGVHxNvYsn88rxl3YvRDYhwtFKiQLO8O5ebrllVaoD/peA/XpDTz8tdX/zKWU8rDn3lkRfH/LB5f0ClU1akYzb1+GQtBiHdeesg8EASHt4ow1UzvrOUDkM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789460464; c=relaxed/simple; bh=zW9p0CztRSiZVUTiJTuEFyMkjkuMAZaOn1FMnzhmj88=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NsYvmj/f/p3mLAqeK+mRRSqXR8Oh6/D+/2nzg97/ZgtHmKbITOrts9ugf9nQtIoLJdI0iTE6QKP62sSaVEJexOOtPPDAN2jM4GNtyfIWR9z4W0xEPR0Uhy7p6utLIaU9HRTDq6o/diKd69KpJTwinPhVKJ43f08ZmLMfvAzhMG8= 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=eMHLnOTb; 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="eMHLnOTb" Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2dd753a52bbso18791905ad.0 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=1789460407; x=1790065207; darn=lists.linux.dev; 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=eMHLnOTbtlDRF5GE5aCJgPgaAcWEzApngfYYoNmMga4YScfWDi9BXXHHJYBF+6bDDf HNNvv0M7KqJcskasOp+KA5o4obw0YnJBrAGskA35ouO1wFf10pgS88rkTerQjZt//JrU phfPMTF1+ajbopadTHAMArLArJRuqZeGS30HLIITju7zvBWk7lc1LLPaD3pgsYc8wdBq u0/9vbEbYo8kyxgkD6WwyypH7+EGHnef6tao+ZvBeg30Cg33shAMQZvragAlRDn1rDH3 GawiAnknFZeLqpk9UlzK90rvrhMW0md0/9AYVSafbLsO5dinDekQkVv3uGmhUmbwE4ok fXUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789460407; x=1790065207; 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=Vq92GB/Pk6Q0OeJm98VdgEUZiwUmvLoCp3RDti60YrKoFOlCQ4rcW/BwdhV7cJIcoF HrLPPzaNas+Llct8qemPQE+cub2IjcCagYbVtaF+b3hevHl64eWI5pMIXp5ZrPxPkXcR ErUp2QIX/W4wl4/tkRC+v1lp2aan7gnO9c4deG2MA1ob49pzfsaPi3pcxLrlBmKVtJ5x EKj99TXm2m5FCKqXV4cNOoq2K7zwbaRb1S0ut7rTcyZLvHF5Z7gW9lOi3+svcw+Z1iLY d+soO3KseRyPAVkh5ysZlLoJa9sfcy8/E59Wn6XGc7aYIeHsrJGiD3b4XIU/YVUr6+0W p84A== X-Forwarded-Encrypted: i=1; AKwUvBw9KYNKaRau4o8MjQ91SAPTxJV7ipt/+p/fgF25EBtglRcaoLr0umpyKR/I7JaHKKIsVlhrh+QJIkE=@lists.linux.dev X-Gm-Message-State: AFuF++kBgPO8VRM9iONOmE0fvkrgkENrKE/y/O5DcoUeUAJMV2xnjHWo XyXGsVBmpFkNuk3mgd2GA0bGXSfZKAUep8mAfF9nd3Oe3O8OFjmYpzIDQjqZoqdP9mKmTEAKvqh 6 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: loongarch@lists.linux.dev 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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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