leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: seq: Make ioctls race-free

Browse Source 
The ALSA sequencer ioctls have no protection against racy calls while
the concurrent operations may lead to interfere with each other.  As
reported recently, for example, the concurrent calls of setting client
pool with a combination of write calls may lead to either the
unkillable dead-lock or UAF.

As a slightly big hammer solution, this patch introduces the mutex to
make each ioctl exclusive.  Although this may reduce performance via
parallel ioctl calls, usually it's not demanded for sequencer usages,
hence it should be negligible.

Reported-by: Luo Quan <a4651386@163.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-01-09 23:11:03 +01:00
parent 23b19b7b50
commit b3defb791b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/seq/seq_clientmgr.c
View File

@ -221,6 +221,7 @@ static struct snd_seq_client *seq_create_client1(int client_index, int poolsize)
rwlock_init(&client->ports_lock); rwlock_init(&client->ports_lock);
mutex_init(&client->ports_mutex); mutex_init(&client->ports_mutex);
INIT_LIST_HEAD(&client->ports_list_head); INIT_LIST_HEAD(&client->ports_list_head);
mutex_init(&client->ioctl_mutex);
/* find free slot in the client table */ /* find free slot in the client table */
spin_lock_irqsave(&clients_lock, flags); spin_lock_irqsave(&clients_lock, flags);
@ -2130,7 +2131,9 @@ static long snd_seq_ioctl(struct file *file, unsigned int cmd,
return -EFAULT; return -EFAULT;
} }
mutex_lock(&client->ioctl_mutex);
err = handler->func(client, &buf); err = handler->func(client, &buf);
mutex_unlock(&client->ioctl_mutex);
if (err >= 0) { if (err >= 0) {
/* Some commands includes a bug in 'dir' field. */ /* Some commands includes a bug in 'dir' field. */
if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT || if (handler->cmd == SNDRV_SEQ_IOCTL_SET_QUEUE_CLIENT ||

1
sound/core/seq/seq_clientmgr.h
View File

@ -61,6 +61,7 @@ struct snd_seq_client {
struct list_head ports_list_head; struct list_head ports_list_head;
rwlock_t ports_lock; rwlock_t ports_lock;
struct mutex ports_mutex; struct mutex ports_mutex;
struct mutex ioctl_mutex;
int convert32; /* convert 32->64bit */ int convert32; /* convert 32->64bit */
/* output pool */ /* output pool */