summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandr Mishin <amishin@t-argos.ru>2024-03-28 20:33:37 +0300
committerMark Brown <broonie@kernel.org>2024-03-28 22:27:59 +0300
commitea60ab95723f5738e7737b56dda95e6feefa5b50 (patch)
tree02daedbbb7684a82d4cf28136d6c77fae927b111
parent559aebe45a054a479fdbd2a3dfba999ffd73cc9d (diff)
downloadlinux-ea60ab95723f5738e7737b56dda95e6feefa5b50.tar.xz
ASoC: kirkwood: Fix potential NULL dereference
In kirkwood_dma_hw_params() mv_mbus_dram_info() returns NULL if CONFIG_PLAT_ORION macro is not defined. Fix this bug by adding NULL check. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: bb6a40fc5a83 ("ASoC: kirkwood: Fix reference to PCM buffer address") Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru> Link: https://msgid.link/r/20240328173337.21406-1-amishin@t-argos.ru Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/kirkwood/kirkwood-dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index dd2f806526c1..ef00792e1d49 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -182,6 +182,9 @@ static int kirkwood_dma_hw_params(struct snd_soc_component *component,
const struct mbus_dram_target_info *dram = mv_mbus_dram_info();
unsigned long addr = substream->runtime->dma_addr;
+ if (!dram)
+ return 0;
+
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
kirkwood_dma_conf_mbus_windows(priv->io,
KIRKWOOD_PLAYBACK_WIN, addr, dram);