ALSA: seq: Improve data consistency at polling
PATCH 1/2 ALSA: seq: Improve data consistency at polling
snd_seq_poll() calls snd_seq_write_pool_allocated() that reads out a field in client->pool object, while it can be updated concurrently via ioctls, as reported by syzbot. The data race itself is harmless, as it's merely a poll() call, and the state is volatile. OTOH, the read out of poll object info from the caller side is fragile, and we can leave it better in snd_seq_pool_poll_wait() alone.
A similar pattern is seen in snd_seq_kernel_client_write_poll(), too, which is called from the OSS sequencer.
This patch drops the pool checks from the caller side and add the pool->lock in snd_seq_pool_poll_wait() for better data consistency.
--- sound/core/seq/seq_clientmgr.c | 5 +---- sound/core/seq/seq_memory.c | 1 + 2 files changed, 2 insertions(+), 4 deletions(-)
sound/core/seq/seq_clientmgr.c +1 -4
@@ -1130,8 +1130,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait)if (snd_seq_file_flags (file) &SNDRV_SEQ_LFLG_OUTPUT ) {/* check if data is available in the pool */ -if (!snd_seq_write_pool_allocated (client) || -snd_seq_pool_poll_wait (client->pool, file, wait)) +if (snd_seq_pool_poll_wait (client->pool, file, wait)) mask |=EPOLLOUT |EPOLLWRNORM ; }
@@ -2566,8 +2565,6 @@ int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_tableif (client ==NULL )return -ENXIO ; -if (!snd_seq_write_pool_allocated (client)) -return 1 ;if (snd_seq_pool_poll_wait (client->pool, file, wait))return 1 ;return 0 ;
sound/core/seq/seq_memory.c +1 -0
@@ -427,6 +427,7 @@ int snd_seq_pool_poll_wait(struct snd_seq_pool *pool, struct file *file, poll_table *wait) {poll_wait (file, &pool->output_sleep, wait); +guard (spinlock_irq)(&pool->lock);return snd_seq_output_ok (pool); }
Signature · 1 line
2.43.0
PATCH 2/2 ALSA: seq: Avoid client data changes during proc reads
The proc read of each client should protect against the concurrent data changes to keep the data consistent; although they are supposed to be safe and won't crash things, it doesn't guarantee the consistency between the read values. Take client->ioctl_mutex for protecting against the concurrent changes.
--- sound/core/seq/seq_clientmgr.c | 2 ++ 1 file changed, 2 insertions(+)
sound/core/seq/seq_clientmgr.c +2 -0
@@ -2706,6 +2706,7 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry,continue ; } +mutex_lock (&client->ioctl_mutex); snd_iprintf(buffer, "Client %3d : \"%s\" [%s %s]\n", c, client->name, client->type == USER_CLIENT ? "User" : "Kernel",
@@ -2723,6 +2724,7 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry,snd_iprintf (buffer," Input pool :\n" );snd_seq_info_pool (buffer, client->data.user.fifo->pool," " ); } +mutex_unlock (&client->ioctl_mutex);snd_seq_client_unlock (client); } }
Signature · 1 line
2.43.0