summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-13 15:35:06 -0500
committerTakashi Iwai <tiwai@suse.de>2016-01-13 15:42:02 -0500
commitee8413b01045c74340aa13ad5bdf905de32be736 (patch)
treefcf247cfbbab80ece20ba1ff232765b9944d2ff1
parentc4a359a0049f2e17b012b31e801e96566f6391e5 (diff)
ALSA: timer: Fix double unlink of active_list
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> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/core/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 31f40f03e5b7..9241784dfe7d 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -694,7 +694,7 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left)
694 } else { 694 } else {
695 ti->flags &= ~SNDRV_TIMER_IFLG_RUNNING; 695 ti->flags &= ~SNDRV_TIMER_IFLG_RUNNING;
696 if (--timer->running) 696 if (--timer->running)
697 list_del(&ti->active_list); 697 list_del_init(&ti->active_list);
698 } 698 }
699 if ((timer->hw.flags & SNDRV_TIMER_HW_TASKLET) || 699 if ((timer->hw.flags & SNDRV_TIMER_HW_TASKLET) ||
700 (ti->flags & SNDRV_TIMER_IFLG_FAST)) 700 (ti->flags & SNDRV_TIMER_IFLG_FAST))