diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-13 21:35:06 +0100 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-10-29 01:34:08 +0200 |
| commit | 1056b8cb1418680fc3691266b491524101ce57de (patch) | |
| tree | 4dd9a462494449b032f74c82c18cd81ce514d635 /sound/core/timer.c | |
| parent | d300936576ebfe6e234e7faa00fa4b48cfda7aba (diff) | |
| download | kernel_samsung_tuna-1056b8cb1418680fc3691266b491524101ce57de.zip kernel_samsung_tuna-1056b8cb1418680fc3691266b491524101ce57de.tar.gz kernel_samsung_tuna-1056b8cb1418680fc3691266b491524101ce57de.tar.bz2 | |
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.
Change-Id: I95e2ab06180dfe43fb6b7c2875a866b53ca245ce
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>
Diffstat (limited to 'sound/core/timer.c')
| -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 950eed0..e8a12f3 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -689,7 +689,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)) |