diff options
| author | Siqi Lin <siqilin@google.com> | 2017-07-21 20:57:06 +0000 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-08-31 01:38:22 +0200 |
| commit | deb8aaa97b18cace89e73019d86d1b27d1d4379f (patch) | |
| tree | ed0c5ed2512028409a200e79959fedbfcb23d168 /sound/core/timer.c | |
| parent | 73fef29b9b81eece793b5783fa2318062d4de463 (diff) | |
Revert "BACKPORT: ALSA: timer: Fix race between read and ioctl"
This reverts commit 59a480f39844a9a51ac143e8171580171b613b22.
Bug: 62201221
Change-Id: Id79733dc0bd55ec55edb8b6b4884fd47711f9838
Signed-off-by: Siqi Lin <siqilin@google.com>
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index a562a4734..98904d8e5 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1916,7 +1916,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, tu = file->private_data; unit = tu->tread ? sizeof(struct snd_timer_tread) : sizeof(struct snd_timer_read); - mutex_lock(&tu->ioctl_lock); spin_lock_irq(&tu->qlock); while ((long)count - result >= unit) { while (!tu->qused) { @@ -1932,9 +1931,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, add_wait_queue(&tu->qchange_sleep, &wait); spin_unlock_irq(&tu->qlock); - mutex_unlock(&tu->ioctl_lock); schedule(); - mutex_lock(&tu->ioctl_lock); spin_lock_irq(&tu->qlock); remove_wait_queue(&tu->qchange_sleep, &wait); @@ -1977,7 +1974,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, } spin_unlock_irq(&tu->qlock); _error: - mutex_unlock(&tu->ioctl_lock); return result > 0 ? result : err; } |