From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 13 Jan 2022 12:57:16 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v5.16.1~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3de69ce13d6bb9e5baf5cd7ddc2585aaed58999;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	mfd-intel-lpss-fix-too-early-pm-enablement-in-the-acpi-probe.patch
---

diff --git a/queue-4.4/mfd-intel-lpss-fix-too-early-pm-enablement-in-the-acpi-probe.patch b/queue-4.4/mfd-intel-lpss-fix-too-early-pm-enablement-in-the-acpi-probe.patch
new file mode 100644
index 00000000000..ccede0c47f7
--- /dev/null
+++ b/queue-4.4/mfd-intel-lpss-fix-too-early-pm-enablement-in-the-acpi-probe.patch
@@ -0,0 +1,61 @@
+From c9e143084d1a602f829115612e1ec79df3727c8b Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Mon, 1 Nov 2021 21:00:08 +0200
+Subject: mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe()
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+commit c9e143084d1a602f829115612e1ec79df3727c8b upstream.
+
+The runtime PM callback may be called as soon as the runtime PM facility
+is enabled and activated. It means that ->suspend() may be called before
+we finish probing the device in the ACPI case. Hence, NULL pointer
+dereference:
+
+  intel-lpss INT34BA:00: IRQ index 0 not found
+  BUG: kernel NULL pointer dereference, address: 0000000000000030
+  ...
+  Workqueue: pm pm_runtime_work
+  RIP: 0010:intel_lpss_suspend+0xb/0x40 [intel_lpss]
+
+To fix this, first try to register the device and only after that enable
+runtime PM facility.
+
+Fixes: 4b45efe85263 ("mfd: Add support for Intel Sunrisepoint LPSS devices")
+Reported-by: Orlando Chamberlain <redecorating@protonmail.com>
+Reported-by: Aditya Garg <gargaditya08@live.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Tested-by: Aditya Garg <gargaditya08@live.com>
+Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Link: https://lore.kernel.org/r/20211101190008.86473-1-andriy.shevchenko@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mfd/intel-lpss-acpi.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/mfd/intel-lpss-acpi.c
++++ b/drivers/mfd/intel-lpss-acpi.c
+@@ -53,6 +53,7 @@ static int intel_lpss_acpi_probe(struct
+ {
+ 	struct intel_lpss_platform_info *info;
+ 	const struct acpi_device_id *id;
++	int ret;
+ 
+ 	id = acpi_match_device(intel_lpss_acpi_ids, &pdev->dev);
+ 	if (!id)
+@@ -66,10 +67,14 @@ static int intel_lpss_acpi_probe(struct
+ 	info->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ 	info->irq = platform_get_irq(pdev, 0);
+ 
++	ret = intel_lpss_probe(&pdev->dev, info);
++	if (ret)
++		return ret;
++
+ 	pm_runtime_set_active(&pdev->dev);
+ 	pm_runtime_enable(&pdev->dev);
+ 
+-	return intel_lpss_probe(&pdev->dev, info);
++	return 0;
+ }
+ 
+ static int intel_lpss_acpi_remove(struct platform_device *pdev)
diff --git a/queue-4.4/series b/queue-4.4/series
index 94b4c20f64b..7b95fc8208f 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1,3 +1,4 @@
 bluetooth-bfusb-fix-division-by-zero-in-send-path.patch
 usb-core-fix-bug-in-resuming-hub-s-handling-of-wakeup-requests.patch
 usb-fix-slab-out-of-bounds-write-bug-in-usb_hcd_poll_rh_status.patch
+mfd-intel-lpss-fix-too-early-pm-enablement-in-the-acpi-probe.patch