diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-03-05 16:00:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-03-08 02:59:26 -0500 |
commit | d85739367c6d56e475c281945c68fdb05ca74b4c (patch) | |
tree | dbe72abbd30b4eb2f85f2946d5c79ff42e886dbc | |
parent | e312a869cd726c698a75caca0d9e5c22fd3f1534 (diff) |
ALSA: seq: Don't allow resizing pool in use
This is a fix for a (sort of) fallout in the recent commit
d15d662e89fc ("ALSA: seq: Fix racy pool initializations") for
CVE-2018-1000004.
As the pool resize deletes the existing cells, it may lead to a race
when another thread is writing concurrently, eventually resulting a
UAF.
A simple workaround is not to allow the pool resizing when the pool is
in use. It's an invalid behavior in anyway.
Fixes: d15d662e89fc ("ALSA: seq: Fix racy pool initializations")
Reported-by: 范龙飞 <long7573@126.com>
Reported-by: Nicolai Stange <nstange@suse.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 04d4db44fae5..d41ce3ed62ca 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
@@ -1838,6 +1838,9 @@ static int snd_seq_ioctl_set_client_pool(struct snd_seq_client *client, | |||
1838 | (! snd_seq_write_pool_allocated(client) || | 1838 | (! snd_seq_write_pool_allocated(client) || |
1839 | info->output_pool != client->pool->size)) { | 1839 | info->output_pool != client->pool->size)) { |
1840 | if (snd_seq_write_pool_allocated(client)) { | 1840 | if (snd_seq_write_pool_allocated(client)) { |
1841 | /* is the pool in use? */ | ||
1842 | if (atomic_read(&client->pool->counter)) | ||
1843 | return -EBUSY; | ||
1841 | /* remove all existing cells */ | 1844 | /* remove all existing cells */ |
1842 | snd_seq_pool_mark_closing(client->pool); | 1845 | snd_seq_pool_mark_closing(client->pool); |
1843 | snd_seq_queue_client_leave_cells(client->number); | 1846 | snd_seq_queue_client_leave_cells(client->number); |