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 (file)
index 0000000..35a6273
--- /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 <ardb@kernel.org>
+Date: Wed, 27 May 2020 13:37:00 +0200
+Subject: ACPI: GED: use correct trigger type field in _Exx / _Lxx handling
+
+From: Ard Biesheuvel <ardb@kernel.org>
+
+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 <ardb@kernel.org>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 5d24573a1577f31158c55e5783f586c7d0d893c5..d027faeca504115bccf47d11f0ad1f135ced247c 100644 (file)
--- 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