diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2023-10-06 12:28:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-28 17:19:43 +0000 |
| commit | 4a320da7f7cbdab2098b103c47f45d5061f42edd (patch) | |
| tree | 9ac1f29e057d51ff7eee7bbc5e0953930a2d08e8 /sound/hda | |
| parent | b39764d0d2d6bc0384f7d9c8012551897032beb1 (diff) | |
| download | linux-stable-4a320da7f7cbdab2098b103c47f45d5061f42edd.tar.gz linux-stable-4a320da7f7cbdab2098b103c47f45d5061f42edd.tar.bz2 linux-stable-4a320da7f7cbdab2098b103c47f45d5061f42edd.zip | |
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: 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>
Diffstat (limited to 'sound/hda')
| -rw-r--r-- | sound/hda/hdac_stream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index 2633a4bb1d85..214a0680524b 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c @@ -354,8 +354,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) { |