diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-13 21:35:06 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-05-03 22:45:47 +1000 |
| commit | 30decc8a8e13959e2db6bd58628e38de1733c5fb (patch) | |
| tree | ed70976576e7bb8860960e7e72b63f6f86672fb0 /sound | |
| parent | 33d997e867fb6b5f27bbab34daa2759d9e560201 (diff) | |
| download | kernel_samsung_smdk4412-30decc8a8e13959e2db6bd58628e38de1733c5fb.tar.gz kernel_samsung_smdk4412-30decc8a8e13959e2db6bd58628e38de1733c5fb.tar.bz2 kernel_samsung_smdk4412-30decc8a8e13959e2db6bd58628e38de1733c5fb.zip | |
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')
| -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 950eed0c098..e8a12f32e16 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)) |