diff options
author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2015-04-18 02:53:25 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-04-18 09:05:55 +0200 |
commit | bc26d4d06e337ade069f33d3f4377593b24e6e36 (patch) | |
tree | f575da72a0288b57034db2c091cc67bfed7c0982 /sound/oss/dmasound | |
parent | 43c499dc2778b96e21ed14e1a71e7b117a0b406f (diff) | |
download | linux-stable-bc26d4d06e337ade069f33d3f4377593b24e6e36.tar.gz linux-stable-bc26d4d06e337ade069f33d3f4377593b24e6e36.tar.bz2 linux-stable-bc26d4d06e337ade069f33d3f4377593b24e6e36.zip |
sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
A deadlock can be initiated by userspace via ioctl(SNDCTL_SEQ_OUTOFBAND)
on /dev/sequencer with TMR_ECHO midi event.
In this case the control flow is:
sound_ioctl()
-> case SND_DEV_SEQ:
case SND_DEV_SEQ2:
sequencer_ioctl()
-> case SNDCTL_SEQ_OUTOFBAND:
spin_lock_irqsave(&lock,flags);
play_event();
-> case EV_TIMING:
seq_timing_event()
-> case TMR_ECHO:
seq_copy_to_input()
-> spin_lock_irqsave(&lock,flags);
It seems that spin_lock_irqsave() around play_event() is not necessary,
because the only other call location in seq_startplay() makes the call
without acquiring spinlock.
So, the patch just removes spinlocks around play_event().
By the way, it removes unreachable code in seq_timing_event(),
since (seq_mode == SEQ_2) case is handled in the beginning.
Compile tested only.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/dmasound')
0 files changed, 0 insertions, 0 deletions