Commit 4c098dab authored Aug 26, 2019 by Takashi Sakamoto Committed by Takashi Iwai Aug 26, 2019

ALSA: oxfw: fix NULL pointer dereference to unused stream structure



ALSA oxfw driver supports Griffin FireWave. This device supports one
isochronous stream for PCM playback. Current driver executes code to
wait event for stream structure of opposite direction. This causes
NULL pointer dereference.

This commit fixes the bug.

Fixes: ac5d7786 ("ALSA: oxfw: support AMDTP domain")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent b39e077f

sound/firewire/oxfw/oxfw-stream.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -350,13 +350,18 @@ int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw)

		// Wait first packet.
		if (!amdtp_stream_wait_callback(&oxfw->rx_stream,
		CALLBACK_TIMEOUT) \|\|
		!amdtp_stream_wait_callback(&oxfw->tx_stream,
		CALLBACK_TIMEOUT)) {
		err = -ETIMEDOUT;
		goto error;
		}

		if (oxfw->has_output) {
		if (!amdtp_stream_wait_callback(&oxfw->tx_stream,
		CALLBACK_TIMEOUT)) {
		err = -ETIMEDOUT;
		goto error;
		}
		}
		}

		return 0;

Admin message