diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-06-02 13:38:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-06-10 13:39:25 +0200 |
| commit | 029c06103e0ad669e6bec74f26b006198041326d (patch) | |
| tree | a07a89cf747751a1b44a541778c5c25b4599ad6d /sound | |
| parent | d11e5b96efde861e6c753c15e694f3ee34e7a513 (diff) | |
| download | linux-stable-029c06103e0ad669e6bec74f26b006198041326d.tar.gz linux-stable-029c06103e0ad669e6bec74f26b006198041326d.tar.bz2 linux-stable-029c06103e0ad669e6bec74f26b006198041326d.zip | |
ALSA: timer: Fix master timer notification
commit 9c1fe96bded935369f8340c2ac2e9e189f697d5d upstream.
snd_timer_notify1() calls the notification to each slave for a master
event, but it passes a wrong event number. It should be +10 offset,
corresponding to SNDRV_TIMER_EVENT_MXXX, but it's incorrectly with
+100 offset. Casually this was spotted by UBSAN check via syzkaller.
Reported-by: syzbot+d102fa5b35335a7e544e@syzkaller.appspotmail.com
Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/000000000000e5560e05c3bd1d63@google.com
Link: https://lore.kernel.org/r/20210602113823.23777-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index 765ea66665a8..c15c8314671b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -520,9 +520,10 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event) return; if (timer->hw.flags & SNDRV_TIMER_HW_SLAVE) return; + event += 10; /* convert to SNDRV_TIMER_EVENT_MXXX */ list_for_each_entry(ts, &ti->slave_active_head, active_list) if (ts->ccallback) - ts->ccallback(ts, event + 100, &tstamp, resolution); + ts->ccallback(ts, event, &tstamp, resolution); } /* start/continue a master timer */ |