diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-13 23:35:06 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-15 23:42:40 +0300 |
| commit | 73c0532426ba7eb55f0015faebb1cad466a656e0 (patch) | |
| tree | 7db0e03038496cf15a85c72e501b6d239310c0dc | |
| parent | 8ee2ce0efc91dd741ca97662568de1d510b76e91 (diff) | |
| download | linux-73c0532426ba7eb55f0015faebb1cad466a656e0.tar.xz | |
ALSA: timer: Fix double unlink of active_list
[ Upstream commit ee8413b01045c74340aa13ad5bdf905de32be736 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | sound/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 9e8b709dbf3b..3b91162f7a94 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -724,7 +724,7 @@ void snd_timer_interrupt(struct snd_timer * timer, unsigned long ticks_left) } else { ti->flags &= ~SNDRV_TIMER_IFLG_RUNNING; if (--timer->running) - list_del(&ti->active_list); + list_del_init(&ti->active_list); } if ((timer->hw.flags & SNDRV_TIMER_HW_TASKLET) || (ti->flags & SNDRV_TIMER_IFLG_FAST)) |