Skip to contentSkip to conversation

ALSA: usb-audio: fix race condition to UAF in snd_usbmidi_free

PATCH Applied Wenshan Lan 2 participants 2 messages Apr 17 – Apr 20

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: usb-audio: fix race condition to UAF in snd_usbmidi_free

From: Jeongjun Park <[email protected]>

[ Upstream commit 9f2c0ac1423d5f267e7f1d1940780fc764b0fee3 ]

The previous commit 0718a78f6a9f ("ALSA: usb-audio: Kill timer properly at removal") patched a UAF issue caused by the error timer.

However, because the error timer kill added in this patch occurs after the endpoint delete, a race condition to UAF still occurs, albeit rarely.

Additionally, since kill-cleanup for urb is also missing, freed memory can be accessed in interrupt context related to urb, which can cause UAF.

Therefore, to prevent this, error timer and urb must be killed before freeing the heap memory.

Reported-by [email protected]
Fixes 0718a78f6a9f ("ALSA: usb-audio: Kill timer properly at removal")
---
 sound/usb/midi.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
sound/usb/midi.c +4 -5
index 08dd0f0b19a3..49a11e517e78 100644
@@ -1522,15 +1522,14 @@ static void snd_usbmidi_free(struct snd_usb_midi *umidi)
 {
 	int i;
 
+	if (!umidi->disconnected)
+		snd_usbmidi_disconnect(&umidi->list);
+
 	for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
 		struct snd_usb_midi_endpoint *ep = &umidi->endpoints[i];
-		if (ep->out)
-			snd_usbmidi_out_endpoint_delete(ep->out);
-		if (ep->in)
-			snd_usbmidi_in_endpoint_delete(ep->in);
+		kfree(ep->out);
 	}
 	mutex_destroy(&umidi->mutex);
-	timer_shutdown_sync(&umidi->error_timer);
 	kfree(umidi);
 }
 
Signature · 1 line
2.43.0
maintainer Applied
#1 lore raw
Quoted 2 lines · Wenshan Lan

Backport of 9f2c0ac1423d ("ALSA: usb-audio: fix race condition to UAF in snd_usbmidi_free") to 6.1.y.

Queued for 6.1, thanks.

--
Thanks,
Sasha