From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88C11371117; Mon, 5 May 2025 23:03:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486204; cv=none; b=nefKFzVZ9+wwMT/asprYUpEljDzsB6PifRHCrVkb26yl4242b305kCJMbUQ3Ejv3uJ3mzM+7lcrmMVJegfCBc54zdV/QeNiV5lZUnUALcu3zoWSTUwX4vP3xAa5JB1q2M2peGiU2XwzVf1E7JVk3UD7C0K7lL7zVYbUEL2RRe64= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486204; c=relaxed/simple; bh=vR7COF5Sb+r7AxaXEQDXavVKdJW3LbCqBm0qMQUJNlo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=R13vNZ+4neYjnwj6jJI8THZb6i9M64QaXM7ID0vTilOC5bNYTac+QVOm1Jy/23dJNYpDQ2gprEkgJSxTk64XsE0czc+OhpNoVbV8bRJOPzJwRVrnCTmlk3Opc+k+3Z8CD0ZNmCzSGmJBnjB0VvJMXNt4kh8ynEta/gscvqhQ1/k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JoMp8sc6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JoMp8sc6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69A22C4CEF1; Mon, 5 May 2025 23:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486203; bh=vR7COF5Sb+r7AxaXEQDXavVKdJW3LbCqBm0qMQUJNlo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JoMp8sc6ZHNhCNtgGT+PKB49g86fLT4kweuWJ/TXxiLqyFSdijOiD1iQXjIV5/TJl xM8pKgC+0sIjTIqYwlUfwl9k3zk0lXiKVimOZg2jVPxWLTs8UQohQZXKteWUZiHZSi uACUjX3Uiz3n7K8DRMyiVUE1wtJ2pWXGVnq7vjkXBQm62jMKQcbO5agITf2mBpFian HP3mjw1JK7wsh2O0Gh3XulP/vSFhrurXxEQ8ORHCPZ7MH/VFYymsBidy0OfTlf7dpF agLtzkKW8lHT3sObpxnsW/G/g2FdTfLUtqE8rEkpUR7rRPluippk74bd101X+DsadZ Qm7fyCKeQBqrg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kuninori Morimoto , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 203/294] ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() Date: Mon, 5 May 2025 18:55:03 -0400 Message-Id: <20250505225634.2688578-203-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505225634.2688578-1-sashal@kernel.org> References: <20250505225634.2688578-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.89 Content-Transfer-Encoding: 8bit From: Kuninori Morimoto [ Upstream commit 7f1186a8d738661b941b298fd6d1d5725ed71428 ] snd_soc_dai_set_tdm_slot() calls .xlate_tdm_slot_mask() or snd_soc_xlate_tdm_slot_mask(), but didn't check its return value. Let's check it. This patch might break existing driver. In such case, let's makes each func to void instead of int. Signed-off-by: Kuninori Morimoto Link: https://patch.msgid.link/87o6z7yk61.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-dai.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 9a828e55c4f9e..507743c87e402 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -275,10 +275,11 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, if (dai->driver->ops && dai->driver->ops->xlate_tdm_slot_mask) - dai->driver->ops->xlate_tdm_slot_mask(slots, - &tx_mask, &rx_mask); + ret = dai->driver->ops->xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); else - snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); + ret = snd_soc_xlate_tdm_slot_mask(slots, &tx_mask, &rx_mask); + if (ret) + goto err; for_each_pcm_streams(stream) snd_soc_dai_tdm_mask_set(dai, stream, *tdm_mask[stream]); @@ -287,6 +288,7 @@ int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, dai->driver->ops->set_tdm_slot) ret = dai->driver->ops->set_tdm_slot(dai, tx_mask, rx_mask, slots, slot_width); +err: return soc_dai_ret(dai, ret); } EXPORT_SYMBOL_GPL(snd_soc_dai_set_tdm_slot); -- 2.39.5