瀏覽代碼

ALSA: firewire-lib: avoid NULL pointer dereference after closing MIDI port

When asynchronous MIDI port is closed before callbacked, the callback
function causes NULL pointer dereference to missing MIDI substream.

This commit fixes this bug.

Fixes: e8a40d9bcb23('ALSA: firewire-lib: schedule work again when MIDI substream has rest of MIDI messages')
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Sakamoto 10 年之前
父節點
當前提交
56b1c72a75
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      sound/firewire/lib.c

+ 5 - 1
sound/firewire/lib.c

@@ -74,7 +74,11 @@ static void async_midi_port_callback(struct fw_card *card, int rcode,
 	struct snd_fw_async_midi_port *port = callback_data;
 	struct snd_rawmidi_substream *substream = ACCESS_ONCE(port->substream);
 
-	if (rcode == RCODE_COMPLETE && substream != NULL)
+	/* This port is closed. */
+	if (substream == NULL)
+		return;
+
+	if (rcode == RCODE_COMPLETE)
 		snd_rawmidi_transmit_ack(substream, port->consume_bytes);
 	else if (!rcode_is_permanent_error(rcode))
 		/* To start next transaction immediately for recovery. */