Skip to content

Commit e3cd33a

Browse files
committed
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. Reported-by: [email protected] Closes: https://lore.kernel.org/[email protected] Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent aa85822 commit e3cd33a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

sound/core/seq/seq_clientmgr.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,8 +1130,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait)
11301130
if (snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_OUTPUT) {
11311131

11321132
/* check if data is available in the pool */
1133-
if (!snd_seq_write_pool_allocated(client) ||
1134-
snd_seq_pool_poll_wait(client->pool, file, wait))
1133+
if (snd_seq_pool_poll_wait(client->pool, file, wait))
11351134
mask |= EPOLLOUT | EPOLLWRNORM;
11361135
}
11371136

@@ -2566,8 +2565,6 @@ int snd_seq_kernel_client_write_poll(int clientid, struct file *file, poll_table
25662565
if (client == NULL)
25672566
return -ENXIO;
25682567

2569-
if (! snd_seq_write_pool_allocated(client))
2570-
return 1;
25712568
if (snd_seq_pool_poll_wait(client->pool, file, wait))
25722569
return 1;
25732570
return 0;

sound/core/seq/seq_memory.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ int snd_seq_pool_poll_wait(struct snd_seq_pool *pool, struct file *file,
427427
poll_table *wait)
428428
{
429429
poll_wait(file, &pool->output_sleep, wait);
430+
guard(spinlock_irq)(&pool->lock);
430431
return snd_seq_output_ok(pool);
431432
}
432433

0 commit comments

Comments
 (0)