raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

ALSA: timer: Fix double unlink of active_list

Browse Source 
commit ee8413b010 upstream.

ALSA timer instance object has a couple of linked lists and they are
unlinked unconditionally at snd_timer_stop().  Meanwhile
snd_timer_interrupt() unlinks it, but it calls list_del() which leaves
the element list itself unchanged.  This ends up with unlinking twice,
and it was caught by syzkaller fuzzer.

The fix is to use list_del_init() variant properly there, too.

Reported-by: Dmitry Vyukov <dvyukov@google.com>
Tested-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai
2016-01-13 21:35:06 +01:00
committed by Greg Kroah-Hartman
parent d87622a166
commit 3c0e535fee
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/core/timer.c
View File

@@ -704,7 +704,7 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)
} else { } else {
ti->flags &= ~SNDRV_TIMER_IFLG_RUNNING; ti->flags &= ~SNDRV_TIMER_IFLG_RUNNING;
if (--timer->running) if (--timer->running)
list_del(&ti->active_list); list_del_init(&ti->active_list);
} }
if ((timer->hw.flags & SNDRV_TIMER_HW_TASKLET) || if ((timer->hw.flags & SNDRV_TIMER_HW_TASKLET) ||
(ti->flags & SNDRV_TIMER_IFLG_FAST)) (ti->flags & SNDRV_TIMER_IFLG_FAST))