From: Greg Kroah-Hartman Date: Wed, 17 Jun 2020 16:56:13 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.7.4~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d89bdf7f3db224112e8d6858af0a60dfc4e76667;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch --- diff --git a/queue-4.9/acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch b/queue-4.9/acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch new file mode 100644 index 00000000000..35a62738216 --- /dev/null +++ b/queue-4.9/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.9/series b/queue-4.9/series index 5d24573a157..d027faeca50 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -51,3 +51,4 @@ perf-add-cond_resched-to-task_function_call.patch agp-intel-reinforce-the-barrier-after-gtt-updates.patch can-kvaser_usb-kvaser_usb_leaf-fix-some-info-leaks-to-usb-devices.patch media-dvb_frontend-ensure-that-inital-front-end-status-initialized.patch +acpi-ged-use-correct-trigger-type-field-in-_exx-_lxx-handling.patch