Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e758557 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

ACPI: resource: Fix memory resource type union access 



[ Upstream commit 7899ca9f3bd2b008e9a7c41f2a9f1986052d7e96 ]

In acpi_decode_space() addr->info.mem.caching is checked on main level
for any resource type but addr->info.mem is part of union and thus
valid only if the resource type is memory range.

Move the check inside the preceeding switch/case to only execute it
when the union is of correct type.

Fixes: fcb29bbc ("ACPI: Add prefetch decoding to the address space parser")
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://patch.msgid.link/20241202100614.20731-1-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3aa2ef7f

drivers/acpi/resource.c

+3 −3
Original line number Diff line number Diff line
@@ -250,6 +250,9 @@ static bool acpi_decode_space(struct resource_win *win, 
	switch (addr->resource_type) {

	case ACPI_MEMORY_RANGE:

		acpi_dev_memresource_flags(res, len, wp);



		if (addr->info.mem.caching == ACPI_PREFETCHABLE_MEMORY)

			res->flags |= IORESOURCE_PREFETCH;

		break;

	case ACPI_IO_RANGE:

		acpi_dev_ioresource_flags(res, len, iodec,
@@ -265,9 +268,6 @@ static bool acpi_decode_space(struct resource_win *win, 
	if (addr->producer_consumer == ACPI_PRODUCER)

		res->flags |= IORESOURCE_WINDOW;



	if (addr->info.mem.caching == ACPI_PREFETCHABLE_MEMORY)

		res->flags |= IORESOURCE_PREFETCH;



	return !(res->flags & IORESOURCE_DISABLED);

}