| Message ID | 20240911111317.4072349-1-usama.anjum@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5c4e15e63216e7268bb2f1132ee8fad0ec46bbb7 |
| Headers | show |
| Series | ASoC: mediatek: mt8365: check validity before usage of i2s_data | expand |
Il 11/09/24 13:13, Muhammad Usama Anjum ha scritto: > There may be a case where i2s_data may not get initialized by the for > loop which will cause the kernel crash. Initialize the i2s_data to NULL > and abort execute if it isn't found. > > Fixes: 402bbb13a195 ("ASoC: mediatek: mt8365: Add I2S DAI support") > Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On Wed, 11 Sep 2024 16:13:07 +0500, Muhammad Usama Anjum wrote: > There may be a case where i2s_data may not get initialized by the for > loop which will cause the kernel crash. Initialize the i2s_data to NULL > and abort execute if it isn't found. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: mediatek: mt8365: check validity before usage of i2s_data commit: 5c4e15e63216e7268bb2f1132ee8fad0ec46bbb7 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c b/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c index 5003fe5e5ccfe..89ba891c2669b 100644 --- a/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c +++ b/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c @@ -465,13 +465,16 @@ void mt8365_afe_set_i2s_out_enable(struct mtk_base_afe *afe, bool enable) int i; unsigned long flags; struct mt8365_afe_private *afe_priv = afe->platform_priv; - struct mtk_afe_i2s_priv *i2s_data; + struct mtk_afe_i2s_priv *i2s_data = NULL; for (i = 0; i < DAI_I2S_NUM; i++) { if (mt8365_i2s_priv[i].adda_link) i2s_data = afe_priv->dai_priv[mt8365_i2s_priv[i].id]; } + if (!i2s_data) + return; + spin_lock_irqsave(&afe_priv->afe_ctrl_lock, flags); if (enable) {
There may be a case where i2s_data may not get initialized by the for loop which will cause the kernel crash. Initialize the i2s_data to NULL and abort execute if it isn't found. Fixes: 402bbb13a195 ("ASoC: mediatek: mt8365: Add I2S DAI support") Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com> --- sound/soc/mediatek/mt8365/mt8365-dai-i2s.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)