xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: sb: Fix potential double-free of CSP mixer elements

Browse Source 
[ Upstream commit c305366a37441c2ac90b08711cb6f032b43672f2 ]

snd_sb_qsound_destroy() contains the calls of removing the previously
created mixer controls, but it doesn't clear the pointers.  As
snd_sb_qsound_destroy() itself may be repeatedly called via ioctl,
this could lead to double-free potentially.

Fix it by clearing the struct fields properly afterwards.

Link: https://lore.kernel.org/r/20210608140540.17885-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Takashi Iwai
2021-06-08 16:04:37 +02:00
committed by Greg Kroah-Hartman
parent 52d242f2bf
commit 0e54f8ee6b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/isa/sb/sb16_csp.c
View File

@@ -1072,10 +1072,14 @@ static void snd_sb_qsound_destroy(struct snd_sb_csp * p)
card = p->chip->card; card = p->chip->card;
down_write(&card->controls_rwsem); down_write(&card->controls_rwsem);
if (p->qsound_switch) if (p->qsound_switch) {
snd_ctl_remove(card, p->qsound_switch); snd_ctl_remove(card, p->qsound_switch);
if (p->qsound_space) p->qsound_switch = NULL;
}
if (p->qsound_space) {
snd_ctl_remove(card, p->qsound_space); snd_ctl_remove(card, p->qsound_space);
p->qsound_space = NULL;
}
up_write(&card->controls_rwsem); up_write(&card->controls_rwsem);
/* cancel pending transfer of QSound parameters */ /* cancel pending transfer of QSound parameters */