android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: Use del_timer_sync() before freeing timer

Browse Source 
The current code for freeing the emux timer is extremely dangerous:

  CPU0				CPU1
  ----				----
snd_emux_timer_callback()
			    snd_emux_free()
			      spin_lock(&emu->voice_lock)
			      del_timer(&emu->tlist); <-- returns immediately
			      spin_unlock(&emu->voice_lock);
			      [..]
			      kfree(emu);

  spin_lock(&emu->voice_lock);

 [BOOM!]

Instead just use del_timer_sync() which will wait for the timer to finish
before continuing. No need to check if the timer is active or not when
doing so.

This doesn't fix the race of a possible re-arming of the timer, but at
least it won't use the data that has just been freed.

[ Fixed unused variable warning by tiwai ]

Cc: stable@vger.kernel.org
Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20221026231236.6834b551@gandalf.local.home
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Steven Rostedt (Google) 2022-10-26 23:12:36 -04:00 committed by Takashi Iwai
parent 4a4c8482e3
commit f0a868788f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/synth/emux/emux.c
View File

@ -126,15 +126,10 @@ EXPORT_SYMBOL(snd_emux_register);
*/ */
int snd_emux_free(struct snd_emux *emu) int snd_emux_free(struct snd_emux *emu)
{ {
unsigned long flags;
if (! emu) if (! emu)
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&emu->voice_lock, flags); del_timer_sync(&emu->tlist);
if (emu->timer_active)
del_timer(&emu->tlist);
spin_unlock_irqrestore(&emu->voice_lock, flags);
snd_emux_proc_free(emu); snd_emux_proc_free(emu);
snd_emux_delete_virmidi(emu); snd_emux_delete_virmidi(emu);