summaryrefslogtreecommitdiff
path: root/sound/isa
diff options
context:
space:
mode:
authorChengfeng Ye <cyeaa@connect.ust.hk>2021-10-24 13:46:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-11-26 12:39:11 +0300
commit1ac6cd87d8ddd36c43620f82c4d65b058f725f0f (patch)
treea9cf20bb14e1f412ac497014ee00ae252d9d3084 /sound/isa
parent850416beadef5ac7ab0881ba7fe9e723650fb7e3 (diff)
downloadlinux-1ac6cd87d8ddd36c43620f82c4d65b058f725f0f.tar.xz
ALSA: gus: fix null pointer dereference on pointer block
[ Upstream commit a0d21bb3279476c777434c40d969ea88ca64f9aa ] The pointer block return from snd_gf1_dma_next_block could be null, so there is a potential null pointer dereference issue. Fix this by adding a null check before dereference. Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk> Link: https://lore.kernel.org/r/20211024104611.9919-1-cyeaa@connect.ust.hk Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/gus/gus_dma.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/isa/gus/gus_dma.c b/sound/isa/gus/gus_dma.c
index a1c770d826dd..6d664dd8dde0 100644
--- a/sound/isa/gus/gus_dma.c
+++ b/sound/isa/gus/gus_dma.c
@@ -126,6 +126,8 @@ static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)
}
block = snd_gf1_dma_next_block(gus);
spin_unlock(&gus->dma_lock);
+ if (!block)
+ return;
snd_gf1_dma_program(gus, block->addr, block->buf_addr, block->count, (unsigned short) block->cmd);
kfree(block);
#if 0