History

ALSA: timer: Fix zero-division by continue of uninitialized instance

When a user timer instance is continued without the explicit start beforehand, the system gets eventually zero-division error like: divide error: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN CPU: 1 PID: 27320 Comm: syz-executor Not tainted 4.8.0-rc3-next-20160825+ #8 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 task: ffff88003c9b2280 task.stack: ffff880027280000 RIP: 0010:[<ffffffff858e1a6c>] [< inline >] ktime_divns include/linux/ktime.h:195 RIP: 0010:[<ffffffff858e1a6c>] [<ffffffff858e1a6c>] snd_hrtimer_callback+0x1bc/0x3c0 sound/core/hrtimer.c:62 Call Trace: <IRQ> [< inline >] __run_hrtimer kernel/time/hrtimer.c:1238 [<ffffffff81504335>] __hrtimer_run_queues+0x325/0xe70 kernel/time/hrtimer.c:1302 [<ffffffff81506ceb>] hrtimer_interrupt+0x18b/0x420 kernel/time/hrtimer.c:1336 [<ffffffff8126d8df>] local_apic_timer_interrupt+0x6f/0xe0 arch/x86/kernel/apic/apic.c:933 [<ffffffff86e13056>] smp_apic_timer_interrupt+0x76/0xa0 arch/x86/kernel/apic/apic.c:957 [<ffffffff86e1210c>] apic_timer_interrupt+0x8c/0xa0 arch/x86/entry/entry_64.S:487 <EOI> ..... Although a similar issue was spotted and a fix patch was merged in commit [6b760bb2c63a: ALSA: timer: fix division by zero after SNDRV_TIMER_IOCTL_CONTINUE], it seems covering only a part of iceberg. In this patch, we fix the issue a bit more drastically. Basically the continue of an uninitialized timer is supposed to be a fresh start, so we do it for user timers. For the direct snd_timer_continue() call, there is no way to pass the initial tick value, so we kick out for the uninitialized case.

Takashi Iwai committed 10 years ago

Commit 9f8a7651 parent 11749e01 file · +14 −0Browse files

Unified · Split

sound/core/timer.c+14−0
@@ -35,6 +35,9 @@ · 34 unmodified lines
3535 #include <sound/initval.h>
3636 #include <linux/kmod.h>
3737
38+/* internal flags */
39+#define SNDRV_TIMER_IFLG_PAUSED 0x00010000
40+
3841 #if IS_ENABLED(CONFIG_SND_HRTIMER)
3942 #define DEFAULT_TIMER_LIMIT 4
4043 #else
@@ -539,6 +542,10 @@ static int snd_timer_stop1(struct snd_timer_instance *timeri, bool stop) · 498 unmodified lines
539542 }
540543 }
541544 timeri->flags &= ~(SNDRV_TIMER_IFLG_RUNNING | SNDRV_TIMER_IFLG_START);
545+ if (stop)
546+ timeri->flags &= ~SNDRV_TIMER_IFLG_PAUSED;
547+ else
548+ timeri->flags |= SNDRV_TIMER_IFLG_PAUSED;
542549 snd_timer_notify1(timeri, stop ? SNDRV_TIMER_EVENT_STOP :
543550 SNDRV_TIMER_EVENT_CONTINUE);
544551 unlock:
@@ -600,6 +607,10 @@ int snd_timer_stop(struct snd_timer_instance *timeri) · 55 unmodified lines
600607 */
601608 int snd_timer_continue(struct snd_timer_instance *timeri)
602609 {
610+ /* timer can continue only after pause */
611+ if (!(timeri->flags & SNDRV_TIMER_IFLG_PAUSED))
612+ return -EINVAL;
613+
603614 if (timeri->flags & SNDRV_TIMER_IFLG_SLAVE)
604615 return snd_timer_start_slave(timeri, false);
605616 else
@@ -1831,6 +1842,9 @@ static int snd_timer_user_continue(struct file *file) · 1225 unmodified lines
18311842 tu = file->private_data;
18321843 if (!tu->timeri)
18331844 return -EBADFD;
1845+ /* start timer instead of continue if it's not used before */
1846+ if (!(tu->timeri->flags & SNDRV_TIMER_IFLG_PAUSED))
1847+ return snd_timer_user_start(file);
18341848 tu->timeri->lost = 0;
18351849 return (err = snd_timer_continue(tu->timeri)) < 0 ? err : 0;
18361850 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t