Commit 6c705851 authored by Tony Luck's avatar Tony Luck Committed by Rafael J. Wysocki
Browse files

ACPI: APEI: EINJ: Check if user asked for EINJV2 injection 



On an EINJV2 capable system, users may still use the old injection
interface but einj_get_parameter_address() takes the EINJV2 path to map
the parameter structure. This results in the address the user supplied
being stored to the wrong location and the BIOS injecting based on an
uninitialized field (0x0 in the reported case).

Check the version of the request when mapping the EINJ parameter
structure in BIOS reserved memory.

Fixes: 691a0f0a ("ACPI: APEI: EINJ: Discover EINJv2 parameters")
Reported-by: default avatarLai, Yi1 <yi1.lai@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarZaid Alali <zaidal@os.amperecomputing.com>
Reviewed-by: default avatarHanjun Guo <gouhanjun@huawei.com>
Link: https://patch.msgid.link/20250814161706.4489-1-tony.luck@intel.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent c17b750b

drivers/acpi/apei/einj-core.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static void __iomem *einj_get_parameter_address(void) 
			memcpy_fromio(&v5param, p, v5param_size);

			acpi5 = 1;

			check_vendor_extension(pa_v5, &v5param);

			if (available_error_type & ACPI65_EINJV2_SUPP) {

			if (is_v2 && available_error_type & ACPI65_EINJV2_SUPP) {

				len = v5param.einjv2_struct.length;

				offset = offsetof(struct einjv2_extension_struct, component_arr);

				max_nr_components = (len - offset) /