Skip to content

Commit

Permalink
ALSA: aloop: Avoid unexpected timer event callback tasklets
Browse files Browse the repository at this point in the history
loopback_snd_timer_close_cable() function waits until all
scheduled tasklets are completed, but the timer is closed after that
and can generate more event callbacks, scheduling new tasklets,
that will not be synchronized with cable closing.
Move tasklet_kill() call to be executed after snd_timer_close()
call to avoid such case.

Fixes: 26c5337 ("ALSA: aloop: Support selection of snd_timer instead of jiffies")
Signed-off-by: Andrew Gabbasov <andrew_gabbasov@mentor.com>
Link: https://lore.kernel.org/r/20191122175218.17187-2-andrew_gabbasov@mentor.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Andrew Gabbasov authored and Takashi Iwai committed Nov 22, 2019
1 parent c037239 commit 9314e44
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions sound/drivers/aloop.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,15 +302,16 @@ static int loopback_snd_timer_close_cable(struct loopback_pcm *dpcm)
if (!cable->snd_timer.instance)
return 0;

/* wait till drain tasklet has finished if requested */
tasklet_kill(&cable->snd_timer.event_tasklet);

/* will only be called from free_cable() when other stream was
* already closed. Other stream cannot be reopened as long as
* loopback->cable_lock is locked. Therefore no need to lock
* cable->lock;
*/
snd_timer_close(cable->snd_timer.instance);

/* wait till drain tasklet has finished if requested */
tasklet_kill(&cable->snd_timer.event_tasklet);

snd_timer_instance_free(cable->snd_timer.instance);
memset(&cable->snd_timer, 0, sizeof(cable->snd_timer));

Expand Down

0 comments on commit 9314e44

Please sign in to comment.