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 2E6BC28A72B; Mon, 5 May 2025 23:17:04 +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=1746487025; cv=none; b=ib8zGPq+28U4K3PoAqVqZ9+vIT0BK+pY+YJk+mKqODEaCcCHKjzs4bdLpgZPGmbmlKrnPYi5cWR2GudTCNtOwlddHO2T1mpsFyV0KMsANBhxBOecbb3wEqw0sWsDD3AmIz+N1G8UMeMGBsRgM4EG9Khtd45E8CpPVsXbN17UTyY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746487025; c=relaxed/simple; bh=LcwQlAEda51+4jXDt1x9oG2t6rsVcxkQ3Gw3R2XDHF0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mcTrgR4FcehhZ7ij5h0XgYWOFUMb+DbvzIWy3uh9gzp3ZAYGGjc0F9fWDmR2Ziwl7NfKdO9jKFN0Fmzh/3VUpti48hXARTrw9mocD+8AL2IRUtWJO/yiQouJc8aU3t4F6wFkHVGWwgVdw/QBNnLE/xy1lec9Yjr2F6iptwZlgLE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KeIz9MLO; 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="KeIz9MLO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11010C4CEF1; Mon, 5 May 2025 23:17:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746487024; bh=LcwQlAEda51+4jXDt1x9oG2t6rsVcxkQ3Gw3R2XDHF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KeIz9MLOpEkJQcldE05MxCsZLYlQRpJteCsOITAez8DlHZV5lbISSzjv+T6HbDZWh lXKRzspOiU2HlI/WnSnD+q4r102WYxisexarRXpESCSWm6jd3re2yI6+KV24o+felR NznlRG9w37bNGPbYjxB/Uv/lEvMzucaAm59XsooRMD90w5C+fUHIHLNg9a9ByxEvEX Ma4nUYV7xjCzvQw+2ml5WgdSKO/bY4CJei0P2IczRnKh7aWtIfOBKGj/SASq61hMrz ntwuJ6zeafEYGQfPNSP98A2cAS0L1EN6EtwDAcuwRbr3vfUIG9ljgnCkb8s4OTKrSj OZoqQO3YIYNjA== 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 5.15 114/153] ASoC: soc-dai: check return value at snd_soc_dai_set_tdm_slot() Date: Mon, 5 May 2025 19:12:41 -0400 Message-Id: <20250505231320.2695319-114-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505231320.2695319-1-sashal@kernel.org> References: <20250505231320.2695319-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.181 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 3db0fcf24385a..05a9404544de9 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -271,10 +271,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; dai->tx_mask = tx_mask; dai->rx_mask = rx_mask; @@ -283,6 +284,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