Unverified Commit 4acbc73f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5941 CVE-2021-46926 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Mingrui <liumingrui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VYOEVGSRKCNL7UACUR743JTY72E6MVZ5/ 
CVE-2021-46926

Libin Yang (1):
  ALSA: hda: intel-sdw-acpi: harden detection of controller


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/I947TK 
 
Link:https://gitee.com/openeuler/kernel/pulls/5941

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 24ec46d3 c38b127c

drivers/soundwire/intel_init.c

+3 −2
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
		return AE_NOT_FOUND;

	}



	info->handle = handle;



	/*

	 * On some Intel platforms, multiple children of the HDAS

	 * device can be found, but only one of them is the SoundWire
@@ -386,6 +384,9 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
	if (FIELD_GET(GENMASK(31, 28), adr) != SDW_LINK_TYPE)

		return AE_OK; /* keep going */



	/* found the correct SoundWire controller */

	info->handle = handle;



	/* device found, stop namespace walk */

	return AE_CTRL_TERMINATE;

}