Unverified Commit 15b5221d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

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

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4H26GERVJZ7SDLRG3EQHE7IGIKKCCPZ7/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RFHM 
 
Link:https://gitee.com/openeuler/kernel/pulls/8186

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents d89af4ae a4d51cc7

sound/hda/hdac_stream.c

+4 −2
Original line number Diff line number Diff line
@@ -241,8 +241,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);



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

		if (azx_dev->direction != substream->stream)