diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-02-09 12:02:32 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-04 10:18:38 -0500 |
| commit | 89e9cac76ab193efe5c01e7bf7dd687f61056419 (patch) | |
| tree | f98d8dcf19ce39ed556bc598bc015dd7eafe4d1d | |
| parent | 3f8a01e591dad29e20d911844b66a0c3d169ebdc (diff) | |
| download | lwn-89e9cac76ab193efe5c01e7bf7dd687f61056419.tar.gz lwn-89e9cac76ab193efe5c01e7bf7dd687f61056419.zip | |
ALSA: timer: Fix race between stop and interrupt
[ Upstream commit ed8b1d6d2c741ab26d60d499d7fbb7ac801f0f51 ]
A slave timer element also unlinks at snd_timer_stop() but it takes
only slave_active_lock. When a slave is assigned to a master,
however, this may become a race against the master's interrupt
handling, eventually resulting in a list corruption. The actual bug
could be seen with a syzkaller fuzzer test case in BugLink below.
As a fix, we need to take timeri->timer->lock when timer isn't NULL,
i.e. assigned to a master, while the assignment to a master itself is
protected by slave_active_lock.
BugLink: http://lkml.kernel.org/r/CACT4Y+Y_Bm+7epAb=8Wi=AaWd+DYS7qawX52qxdCfOfY49vozQ@mail.gmail.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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 2cd7d3a12299..c657c672aa41 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -509,9 +509,13 @@ static int _snd_timer_stop(struct snd_timer_instance *timeri, int event) spin_unlock_irqrestore(&slave_active_lock, flags); return -EBUSY; } + if (timeri->timer) + spin_lock(&timeri->timer->lock); timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING; list_del_init(&timeri->ack_list); list_del_init(&timeri->active_list); + if (timeri->timer) + spin_unlock(&timeri->timer->lock); spin_unlock_irqrestore(&slave_active_lock, flags); goto __end; } |