Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25277756 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Greg Kroah-Hartman
Browse files

ALSA: hda: Fix possible null-ptr-deref when assigning a stream 



[ Upstream commit f93dc90c2e8ed664985e366aa6459ac83cdab236 ]

While AudioDSP drivers assign streams exclusively of HOST or LINK type,
nothing blocks a user to attempt to assign a COUPLED stream. As
supplied substream instance may be a stub, what is the case when
code-loading, such scenario ends with null-ptr-deref.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20231006102857.749143-2-cezary.rojewski@intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 953ed26a

sound/hda/hdac_stream.c

+4 −2
Original line number Diff line number Diff line
@@ -313,8 +313,10 @@ struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus, 
	struct hdac_stream *res = NULL;



	/* make a non-zero unique key for the substream */

	int key = (substream->pcm->device << 16) | (substream->number << 2) |

		(substream->stream + 1);

	int key = (substream->number << 2) | (substream->stream + 1);



	if (substream->pcm)

		key |= (substream->pcm->device << 16);



	spin_lock_irq(&bus->reg_lock);

	list_for_each_entry(azx_dev, &bus->stream_list, list) {