Commit 3b15ecd3 authored Apr 10, 2024 by Libin Yang Committed by Liu Mingrui Apr 10, 2024

ALSA: hda: intel-sdw-acpi: harden detection of controller

mainline inclusion
from mainline-v5.16-rc7
commit 385f287f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I947TK
CVE: CVE-2021-46926

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=385f287f9853da402d94278e59f594501c1d1dad



--------------------------------

The existing code currently sets a pointer to an ACPI handle before
checking that it's actually a SoundWire controller. This can lead to
issues where the graph walk continues and eventually fails, but the
pointer was set already.

This patch changes the logic so that the information provided to
the caller is set when a controller is found.

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20211221010817.23636-2-yung-chuan.liao@linux.intel.com


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Conflicts:
	sound/hda/intel-sdw-acpi.c
Signed-off-by: Liu Mingrui <liumingrui@huawei.com>

parent 9f126942

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;
		}