ALSA: timer: Fix missing irq-disable at closing

tiwai · tiwai · commit 587d67fd929a · 2024-03-15T11:16:47.000+01:00
The conversion to guard macro dropped the irq-disablement at closing mistakenly, which may lead to a race. Fix it. Fixes: beb4597 ("ALSA: timer: Use guard() for locking") Reported-by: syzbot+28c1a5a5b041a754b947@syzkaller.appspotmail.com Closes: http://lore.kernel.org/r/0000000000000b9a510613b0145f@google.com Message-ID: <20240315101447.18395-1-tiwai@suse.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/core/timer.c b/sound/core/timer.c
@@ -409,7 +409,7 @@ static void snd_timer_close_locked(struct snd_timer_instance *timeri,
 	struct snd_timer *timer = timeri->timer;
 
 	if (timer) {
-		guard(spinlock)(&timer->lock);
+		guard(spinlock_irq)(&timer->lock);
 		timeri->flags |= SNDRV_TIMER_IFLG_DEAD;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ static void snd_timer_close_locked(struct snd_timer_instance *timeri,`
`409`	`409`	`struct snd_timer *timer = timeri->timer;`
`410`	`410`
`411`	`411`	`if (timer) {`
`412`		`- guard(spinlock)(&timer->lock);`
	`412`	`+ guard(spinlock_irq)(&timer->lock);`
`413`	`413`	`timeri->flags \|= SNDRV_TIMER_IFLG_DEAD;`
`414`	`414`	`}`
`415`	`415`