diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-11-30 10:08:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-16 10:32:27 +0100 |
| commit | a94c6d0bb9e0b6aae587a22ba9a10ae80e242f5d (patch) | |
| tree | a100c995eba046cafbaba71e880b63a22ffef132 /sound/core | |
| parent | 14416b2c878b989674761118db8072bf7f0c9501 (diff) | |
| download | linux-stable-a94c6d0bb9e0b6aae587a22ba9a10ae80e242f5d.tar.gz linux-stable-a94c6d0bb9e0b6aae587a22ba9a10ae80e242f5d.tar.bz2 linux-stable-a94c6d0bb9e0b6aae587a22ba9a10ae80e242f5d.zip | |
ALSA: seq: Remove spurious WARN_ON() at timer check
commit 43a3542870328601be02fcc9d27b09db467336ef upstream.
The use of snd_BUG_ON() in ALSA sequencer timer may lead to a spurious
WARN_ON() when a slave timer is deployed as its backend and a
corresponding master timer stops meanwhile. The symptom was triggered
by syzkaller spontaneously.
Since the NULL timer is valid there, rip off snd_BUG_ON().
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/seq/seq_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_timer.c b/sound/core/seq/seq_timer.c index a2468f1101d1..0e6210000fa9 100644 --- a/sound/core/seq/seq_timer.c +++ b/sound/core/seq/seq_timer.c @@ -355,7 +355,7 @@ static int initialize_timer(struct snd_seq_timer *tmr) unsigned long freq; t = tmr->timeri->timer; - if (snd_BUG_ON(!t)) + if (!t) return -EINVAL; freq = tmr->preferred_resolution; |