diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-13 21:35:06 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2016-03-12 14:25:46 +0100 |
| commit | 22c74cd06706640054edb086d6a07a05a7b3d023 (patch) | |
| tree | 3efaab4d707d17d58956d4edae0b709c9e6c80cd | |
| parent | b3f7ff5894fbac7fe2b98851ad257ad2d46b0baa (diff) | |
| download | lwn-22c74cd06706640054edb086d6a07a05a7b3d023.tar.gz lwn-22c74cd06706640054edb086d6a07a05a7b3d023.zip | |
ALSA: timer: Fix double unlink of active_list
commit ee8413b01045c74340aa13ad5bdf905de32be736 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: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 21f5df6734dd..fb298032619f 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)) |