From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 1039A47012A for ; Fri, 7 Aug 2026 11:42:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786102943; cv=none; b=J1HHedN1Tdq+Kb22LuAuIgQpC35eJyhQ1q/RCD7iRdbwSKf13knPqf4BZBuAGamDndZp9wwBc46svJ20H3TKbugNqdnAHCn2CtmPk2YF0DH6ZX0q5jLb3xFPDMPFXF7XziOtdF3UJKM8EZMvuHlchzTDHvDGMpdXIZyiZWUDX/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786102943; c=relaxed/simple; bh=G7A9VyBzNW+ys4oCdJOqO6Hbk5F6spxIfIbUNWzCj3g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BS/7Ixtkx8FwpDtjc6ylN70iXVgIXFA1v+amL7qyqWVu/h/DhgTA5I/yJCJbJ/yDhqBHV3+e54vL7fSEbfP5uKMcB2+JiVESDyXZoHRqNjjmWWv0p5qcUW3cAnXqWPuh7T/0XiZvos0A1Vg/gIifcsJ6S+MUWVWCfjVxTx64v0c= 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=rwlY4ouh; arc=none smtp.client-ip=209.85.216.43 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="rwlY4ouh" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-38511175ad3so2772180a91.2 for ; Fri, 07 Aug 2026 04:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786102934; x=1786707734; 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=0tFaoWtzLU8DJaY4QXu8kIEx2fyiCWG7Fl24BOjON7o=; b=rwlY4ouhlCHd5rNbVTN7xCMxAogISPGbN7q7yOKKj6IFYH5pSPtdzzewkf1ZT1LUF4 UJ2E0NBKhJVF6WGA/fePCxs9xF8j6KjuvSNt+pQ4sQjcc86iBwdJb4ceiKRQqLvB1ac0 YldxprqgyJB847zV91zVMpmWihtBPziqi+lg4fONj0FOTaua2+rqQcUIwh6w/Jo0FhpV cVtjmXSwV7GLNTCcNUMb9X9JhcLl1lDXCoxnjHXTcxgh3NBRVuSZuCfgwYpV2rwpxzca jcm2c6pqrJSvWpDzTHBO6WWESJPLfhbxbBjUAYD9pBUQ+RkeX5YCa13YGcqPEJIeLsdv /DpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786102934; x=1786707734; 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=0tFaoWtzLU8DJaY4QXu8kIEx2fyiCWG7Fl24BOjON7o=; b=dhZelYrLip9D7Gy06YEuNpYGuq+OnUNhFF8jtOrvqFU+c3LnZPKTvAv1APwnXjeHS1 05Sfvx4PAeLBm7alWEZKTw3QZyrysy7epC3YBR9jVJDu1LRqx6dPTEIctiZjZIkScjj0 XQN6GgdiY56hjGE1mNf6Kv3ERuLPWmoHKekYA1myJ/8ZtE3HKXoL6VSyxlMVR6sykfmq CiIw3vQCloVqnMH0H+f8+2yV4CHuIpzMKh3zRCeqfcx2FFPbUOX2R+dIQUnknNjdFixb eThxenEwzvCGQ1uBx423Nx1uGnyv8hWhRKaYwRwjJxn0tQXCeii/ePYMm9ZjNo1/AV6m DtUg== X-Forwarded-Encrypted: i=1; AHgh+Rp2XtAFDIl/KvN87u18sR5esISwIVXM8dqqtoPY2e1xJhTWBwv0MUkMwkmzWW1k7g4igsxH1sK1LmF6D7I=@vger.kernel.org X-Gm-Message-State: AOJu0YxHq1r34Hm7Mzs8wS4kkP894OHkspJQz72WIpZO0zzVC0GE8EXu ERpAiRjUhYU98wudKC2iaP7g/c8k6CdjDjNmbAR9esztBqBH6aGf+yny X-Gm-Gg: AR+sD10mKJcK5Xzs7JseHCeL/RBHiM8mXpWb1hmSlFIVrkTLzy5XG094wIlyLvD2Uhg iY8u7H/j86EsDjJ24HO0hstwFZmhht9qiKlsX4zXZAuGCyvig1ZiiggqN98xDZAiTPFvba/8b1c OjNhCTPt88VghEqpv6hRKp5r4ags0JyxYcG7MLVogWSM4KkVu9557AQ6qZ+Bdpw0cGoXzma7UEu DVwaGqssMykMpQ1uqbjI0jqXiy8TXydPnCPcza39TkLr9NMh5JMp2FNa4l++9ekWqahYufbzrn+ DC/BSyuAnNU/+ajbSB0dt4vHLs3zpAYEcoyCW39B0qYIzNa/upK48AHFU0a260S5QHMHh3NxA6w dlGxAR/TTRdBsfl/W/4DGG8h0Y+4F4xAOmcZ36lOME9w/lExRGt0JzoVUACsVnMGHK3BdlkDlFR eeHAg3x5iTJGcP4EAiiJrcV8uqPEUCunWDyUF/flwqa/MP2BUeeIm1oXT+ss4FeofSij5Wszn1d k+QUh+qeA0= X-Received: by 2002:a17:90b:4b84:b0:38e:8021:2ea9 with SMTP id 98e67ed59e1d1-3903c5f6482mr20137207a91.19.1786102934189; Fri, 07 Aug 2026 04:42:14 -0700 (PDT) Received: from localhost.localdomain ([72.255.58.127]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-315be86d3fcsm6930508eec.4.2026.08.07.04.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2026 04:42:13 -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 3/7] ALSA: cmipci: replace strlcat() with strscpy() Date: Fri, 7 Aug 2026 11:41:35 +0000 Message-ID: <20260807114139.1661-4-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 The "-SWIEC" suffix on card->driver was appended with strlcat(). Take the length of the existing driver name and write the suffix at that offset with strscpy(). This is the same thing the can_multi_ch branch immediately above already does, so both arms of the conditional now build the name the same way. strlcat() and strscpy() both truncate at the end of the buffer, and the suffix is written at the same offset either way. Signed-off-by: Mahad Ibrahim --- sound/pci/cmipci.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 9d9f784e3a8c..c8d98d76b689 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c @@ -2983,8 +2983,12 @@ static int snd_cmipci_create(struct snd_card *card, struct pci_dev *pci, int l = strlen(cm->card->driver); scnprintf(cm->card->driver + l, sizeof(cm->card->driver) - l, "-MC%d", cm->max_channels); - } else if (cm->can_ac3_sw) - strlcat(cm->card->driver, "-SWIEC", sizeof(cm->card->driver)); + } else if (cm->can_ac3_sw) { + int l = strlen(cm->card->driver); + + strscpy(cm->card->driver + l, "-SWIEC", + sizeof(cm->card->driver) - l); + } cm->dig_status = SNDRV_PCM_DEFAULT_CON_SPDIF; cm->dig_pcm_status = SNDRV_PCM_DEFAULT_CON_SPDIF; -- 2.54.0