From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 3E5DD3A9636 for ; Fri, 7 Aug 2026 11:42:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786102939; cv=none; b=bgKbgGmo4/oluQGXIuU0f43f2aziFJnVrHy+hYzn4tNlOUtniNGuR7SWYiO4Duk0gQpTrVY5PDwyFK6UsQwR4GTatHntwFsZBilv9XZ16CisNgzH6aOsSBzS6C5U2uhLBT82ciJoVA+8JMYxrWtalmoLwVdz686FM2q6Baxvyo4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786102939; c=relaxed/simple; bh=e+Wi1O5qLB3tdT7qt3lctISNO+5OOpqeS7DJyRa6J0M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nfu2w3KiBAq0xdb+5g2s5PaORXG/1+3iNHIFZmlZ8teQ09e2faztxTVTTUaJh4rGnw1RxkrOfBLMKS3773L8lPd1MwHvEvBBULCwxQJws2Nx0F4wQ4bhEKPUgiaUJ+qbBtot+tqehKc/FqkaZKSCB43TZsoELBYI+Wk2LmRsdYg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=mWuejuUK; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mWuejuUK" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-384930ca5e2so3512837a91.3 for ; Fri, 07 Aug 2026 04:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786102921; x=1786707721; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TupgkS5U0yW4ptmWsSaBtKNrGrIzBwiT8uuCtS6g84U=; b=mWuejuUKSseItPsLB4vpEoEN+nekyx1rq2oROib+XeJtogsjpPRz7yWK+5GFMUN3Uz V8cdt65PExDPqk8A04QXzRtAWQux4N05RiSOkjcxuv6QdGP8dd0TtkaoGZFVoXEcNWAb RzwvpoG+HQaCdnnRIp+9YcPDv0FtpeEwSJhvV43DMrn1BGpuIjmTPMlbj21O1dzMl7NH sBQO/fHuMZcfjZXuMZWMDQ9SqvXIyZy27K/alE5it2X34lpfuVBHpZsh2Y1nD9DOpYJv QdPBdJnk/iwSIKatPN76ziYbSnJfcbMl79IBhpo4wXURAFuUt3gn8Lw5D7Jcyh+vtPCC ZZ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786102921; x=1786707721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=TupgkS5U0yW4ptmWsSaBtKNrGrIzBwiT8uuCtS6g84U=; b=df7z0jEztMwa1tZ2K9+MKEIjN4yu/H4K9uLJPBYM9cmRMZqoizi9/WvCZBjQC3U8lU pFWvLW86SeI2cB+8VKNh7mTPxLhDjvmoSvPeMJD49ewTU0GRlCS4yijWlWLy0GQMCH1g /HH+/ykc8V4R4O7hVFq3E7BAcNltriiQQRk7b4Bt6WB8j18SYDDq/jYpVAWQdkR3ki4t N9wHEhA3WaCvGdkwvRfAGP+rVcnMy7P1TvsQG0982OtVeVsHZz2SYnvWJe150gvfexMt iu1vNNienalu4ZX6jHgvh58jkPlYgkD7wuPMJBDBUe4PuVNmaVq09toha4jUGj3Pltwv ChMw== X-Forwarded-Encrypted: i=1; AHgh+Rqj9dAJ9sNq+wdfj8WsIRRTixdlsonlVPy3ULfhUJcocWcwkUupXAOT/ai7lLWLnokt6eRMrb9d5K0uAog=@vger.kernel.org X-Gm-Message-State: AOJu0YxvUiFAzlZl1kc/Py3hAqGkttrdlgVc2hQa1Zz5c16TYGxeeWtP qoJBnJtFDexte3u9N19CBgR0wfHwtAsbVdRJAhwAehc1wGRB75GOXGn/jSCmrbwC X-Gm-Gg: AR+sD12+QFNZi1cl3t7OncIGHIQquxNy5SirUlMtKYcco60h3ufz82h0s7WkG33jah3 n0PpJYIv2hiiG9Nay9uEITMefOTmDZ4XckltaewSDjRask5EH3ZYBfHzVU69kajRInavriaE/xe y9fk1ax5fez2N2ftU5rgnj0WhnhfvIoDj29DouXlxPYozaxALYB97BWZ3eyDkeULyo+4vPv89ph DPOOT5hFqObnhyk6n6E9YxQpsIzimkSuXGdGnKVbbUHvTn4BcCR4XN43f1y1PwC/yeXE10LY3MS wDqFx62pxw+5qCaWm3jFjtSlytxNhePbRRmH9ORXGWQCUceoUpw7QK7VJ/zdK/rFw4hD+sKId8h bJguYet5f4SMo1X4bQ/s1/biuzPZLY1mkcCLM2ZmFHP9I90EcPufrVZKrcjhqjfwQrw0gok4re0 ed5NbtDrK2YObBck3COOeHnQhRPqz+IQrBya0YW8ojRLN2nJYHFYvo9qNd0CkWt+X0IfZ+K6xM3 vck9QcTUgM= X-Received: by 2002:a17:90b:2dc1:b0:38f:de97:b06 with SMTP id 98e67ed59e1d1-3903c535d79mr25786746a91.5.1786102921248; Fri, 07 Aug 2026 04:42:01 -0700 (PDT) Received: from localhost.localdomain ([72.255.58.127]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-315be86d3fcsm6930508eec.4.2026.08.07.04.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 04:42:00 -0700 (PDT) From: Mahad Ibrahim To: Takashi Iwai , Jaroslav Kysela Cc: Kees Cook , Andy Shevchenko , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, Mahad Ibrahim Subject: [PATCH 1/7] ALSA: ump: replace strlcat() with strscpy() Date: Fri, 7 Aug 2026 11:41:33 +0000 Message-ID: <20260807114139.1661-2-mahad.ibrahim.dev@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260807114139.1661-1-mahad.ibrahim.dev@gmail.com> References: <20260807114139.1661-1-mahad.ibrahim.dev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When several function blocks map to the same group, their names are joined with ", " and the separator was appended with strlcat(). Take the current length of group->name with strlen() and write the separator at that offset with strscpy(), passing the space that is left in the buffer. group->name is NUL-terminated within its array, so the offset is always less than the array size and at least one byte remains for strscpy() to work with. Both functions stop at the end of the buffer, so the string that comes out is the same. Signed-off-by: Mahad Ibrahim --- sound/core/ump.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sound/core/ump.c b/sound/core/ump.c index 632c13baf21e..c6f55d2b8dc4 100644 --- a/sound/core/ump.c +++ b/sound/core/ump.c @@ -597,8 +597,11 @@ void snd_ump_update_group_attrs(struct snd_ump_endpoint *ump) } if (!*fb->info.name) continue; - if (*group->name) - strlcat(group->name, ", ", sizeof(group->name)); + if (*group->name) { + int len = strlen(group->name); + + strscpy(group->name + len, ", ", sizeof(group->name) - len); + } safe_append_string(group->name, sizeof(group->name), fb->info.name, sizeof(fb->info.name)); } -- 2.54.0