ALSA: core: Serialize snd_refcount put and sync
PATCH 1/1 ALSA: core: Serialize snd_refcount put and sync
When a thread tries to sync-and-destroy the resource with snd_refcount_sync(), it might lead to a UAF in a very slight time window. Namely, snd_refount_put() calls wake_up() after atomic_dec_and_test(), but wait_event() in snd_refcount_sync() checks the condition via atomic_test() without serialization, hence the thread that called snd_refcount_sync() can continue immediately to release the resource before another thread calls wake_up().
For avoiding the race above, introduce the spinlock and take it at snd_refcount_put() and snd_refcount_sync() in order to serialize the operations.
Fixes dcca9b6064c3 ("ALSA: Add simple refcount helper functions")
Reported-by Sashiko <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- include/sound/core.h | 1 + sound/core/misc.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
include/sound/core.h +1 -0
@@ -84,6 +84,7 @@ struct snd_device {struct snd_refcount {atomic_t count;wait_queue_head_t waiter; +spinlock_t lock; };void snd_refcount_init (struct snd_refcount *ref);
sound/core/misc.c +4 -1
@@ -183,11 +183,13 @@ void snd_refcount_init(struct snd_refcount *ref) {atomic_set (&ref->count,0 );init_waitqueue_head (&ref->waiter); +spin_lock_init (&ref->lock); }EXPORT_SYMBOL_GPL (snd_refcount_init);void snd_refcount_put (struct snd_refcount *ref) { +guard (spinlock_irqsave)(&ref->lock);if (atomic_dec_and_test (&ref->count))wake_up (&ref->waiter); }
@@ -195,6 +197,7 @@ EXPORT_SYMBOL_GPL(snd_refcount_put);void snd_refcount_sync (struct snd_refcount *ref) { -wait_event (ref->waiter, !atomic_read (&ref->count)); +guard (spinlock_irq)(&ref->lock); +wait_event_lock_irq (ref->waiter, !atomic_read (&ref->count), ref->lock); }EXPORT_SYMBOL_GPL (snd_refcount_sync);
Signature · 1 line
2.55.0