TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20231006102857.749143-2-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Cezary Rojewski
2023-10-06 12:28:55 +02:00
committed by Greg Kroah-Hartman
parent 6fceb9fe96
commit 758c7733cb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/hda/hdac_stream.c
View File

@@ -241,8 +241,10 @@ struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus,
struct hdac_stream *res = NULL; struct hdac_stream *res = NULL;
/* make a non-zero unique key for the substream */ /* make a non-zero unique key for the substream */
int key = (substream->pcm->device << 16) | (substream->number << 2) | int key = (substream->number << 2) | (substream->stream + 1);
(substream->stream + 1);
if (substream->pcm)
key |= (substream->pcm->device << 16);
list_for_each_entry(azx_dev, &bus->stream_list, list) { list_for_each_entry(azx_dev, &bus->stream_list, list) {
if (azx_dev->direction != substream->stream) if (azx_dev->direction != substream->stream)