ALSA: emux: Fix UAF of soundfont zones at note-on
PATCH 1/2 ALSA: emux: Fix UAF of soundfont zones at note-on
snd_emux_note_on() looks up the matching zones via snd_soundfont_search_zone(), which takes sflist->lock only during the lookup and returns the raw zone pointers after releasing it. The caller then stores them in vp->zone without any protection. Meanwhile, a concurrent SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES ioctl may unlink and free those zones in snd_soundfont_remove_unlocked(); this leads to a use-after-free in snd_emux_note_on(), and later at accessing the cached vp->zone, e.g. in snd_emux_send_effect().
Fix it by holding sflist->lock in snd_emux_note_on() over the whole zone lookup and voice setup, and let snd_soundfont_search_zone() require the caller to hold the lock, instead. snd_soundfont_lock_preset() takes sflist->lock for setting presets_locked, so the removal path now syncs with the note-on finish.
--- sound/synth/emux/emux_synth.c | 3 +++ sound/synth/emux/soundfont.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-)
sound/synth/emux/emux_synth.c +3 -0
@@ -60,6 +60,9 @@ snd_emux_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)return ; key = note;/* remember the original note */ + +/* hold sflist->lock for protecting against concurrent free */ +guard (spinlock_irqsave)(&emu->sflist->lock); nvoices =get_zone (emu, port, ¬e, vel, chan, table);if (! nvoices)return ;
sound/synth/emux/soundfont.c +6 -3
@@ -1225,6 +1225,9 @@ delete_preset(struct snd_sf_list *sflist, struct snd_sf_zone *zp)* The found zones are stored on 'table' array. max_layers defines * the maximum number of elements in this array. * This function returns the number of found zones. 0 if not found. +* +* The caller must hold sflist->lock, and keep holding it as long as +* the returned zones are accessed. */ int snd_soundfont_search_zone(struct snd_sf_list *sflist, int *notep, int vel,
@@ -1234,11 +1237,11 @@ snd_soundfont_search_zone(struct snd_sf_list *sflist, int *notep, int vel, {int nvoices; -/* this function is supposed to be called atomically, -* so we check the lock. if it's busy, just returns 0 to +lockdep_assert_held (&sflist->lock); + +/* if the presets are being modified, just returns 0 to * tell the caller the busy state */ -guard (spinlock_irqsave)(&sflist->lock);if (sflist->presets_locked)return 0 ; nvoices = search_zones(sflist, notep, vel, preset, bank,
Signature · 1 line
2.55.0
PATCH 2/2 ALSA: emux: Stop voices before freeing zones in all cases
The emux voice caches the soundfont zone pointer in vp->zone, which is referred to later, e.g. in snd_emux_send_effect(). For avoiding dangling pointers, the soundfont code calls the sample_reset callback to stop all voices before freeing zones. However, in a few cases (e.g. emu10k1's missing sample_reset or the call path via remove_info()), the sample reset isn't called properly, leaving the playing voices.
Fix it by always registering the sample_reset callback, falling back to snd_emux_terminate_all() when the driver has no own ops, and by calling sample_reset in remove_info() before freeing the zones.
--- sound/synth/emux/emux.c | 10 +++++++--- sound/synth/emux/soundfont.c | 9 +++++++++ 2 files changed, 16 insertions(+), 3 deletions(-)
sound/synth/emux/emux.c +7 -3
@@ -71,7 +71,12 @@ static int sf_sample_free(void *private_data, struct snd_sf_sample *sp,static void sf_sample_reset (void *private_data) {struct snd_emux *emu = private_data; - emu->ops.sample_reset (emu); + +/* stop all voices that might refer to zones and samples to be freed */ +if (emu->ops.sample_reset) + emu->ops.sample_reset (emu); +else +snd_emux_terminate_all (emu); }int snd_emux_register (struct snd_emux *emu,struct snd_card *card,int index,char *name)
@@ -95,8 +100,7 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch sf_cb.private_data = emu; sf_cb.sample_new = sf_sample_new; sf_cb.sample_free = sf_sample_free; -if (emu->ops.sample_reset) - sf_cb.sample_reset = sf_sample_reset; + sf_cb.sample_reset = sf_sample_reset; emu->sflist =snd_sf_new (&sf_cb, emu->memhdr);if (emu->sflist ==NULL )return -ENOMEM ;
sound/synth/emux/soundfont.c +9 -0
@@ -443,6 +443,15 @@ remove_info(struct snd_sf_list *sflist, struct snd_soundfont *sf,struct snd_sf_zone *prev, *next, *p;int removed =0 ; +/* stop voices before freeing the zones they might refer to */ +for (p = sf->zones; p; p = p->next) { +if (!p->mapped && p->bank == bank && p->instr == instr) { +if (sflist->callback.sample_reset) + sflist->callback.sample_reset (sflist->callback.private_data); +break ; + } + } + prev =NULL ;for (p = sf->zones; p; p = next) { next = p->next;
Signature · 1 line
2.55.0