From dc92c867372fa76f85778b0402b1c3376230e406 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 17 Jun 2020 18:56:27 +0200 Subject: [PATCH] 4.14-stable patches added patches: acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch --- ...ger-type-field-in-_exx-_lxx-handling.patch | 37 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.14/acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch diff --git a/queue-4.14/acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch b/queue-4.14/acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch new file mode 100644 index 00000000000..35a62738216 --- /dev/null +++ b/queue-4.14/acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch @@ -0,0 +1,37 @@ +From e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Wed, 27 May 2020 13:37:00 +0200 +Subject: ACPI: GED: use correct trigger type field in _Exx / _Lxx handling + +From: Ard Biesheuvel + +commit e5c399b0bd6490c12c0af2a9eaa9d7cd805d52c9 upstream. + +Commit ea6f3af4c5e63f69 ("ACPI: GED: add support for _Exx / _Lxx handler +methods") added a reference to the 'triggering' field of either the +normal or the extended ACPI IRQ resource struct, but inadvertently used +the wrong pointer in the latter case. Note that both pointers refer to the +same union, and the 'triggering' field appears at the same offset in both +struct types, so it currently happens to work by accident. But let's fix +it nonetheless + +Fixes: ea6f3af4c5e63f69 ("ACPI: GED: add support for _Exx / _Lxx handler methods") +Signed-off-by: Ard Biesheuvel +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/evged.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/evged.c ++++ b/drivers/acpi/evged.c +@@ -97,7 +97,7 @@ static acpi_status acpi_ged_request_inte + trigger = p->triggering; + } else { + gsi = pext->interrupts[0]; +- trigger = p->triggering; ++ trigger = pext->triggering; + } + + irq = r.start; diff --git a/queue-4.14/series b/queue-4.14/series index 98fe350ed9e..22d4c8a6335 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -72,3 +72,4 @@ mmc-sdhci-msm-clear-tuning-done-flag-while-hs400-tuning.patch mmc-sdio-fix-potential-null-pointer-error-in-mmc_sdio_init_card.patch can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch xen-pvcalls-back-test-for-errors-when-calling-backend_connect.patch +acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch -- 2.47.3