This is a note to let you know that I've just added the patch titled
drm/i915: Fix error handling if driver creation fails during probe
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-fix-error-handling-if-driver-creation-fails-during-probe.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 718551bbed3ca5308a9f9429305dd074727e8d46 Mon Sep 17 00:00:00 2001
From: Matt Roper <matthew.d.roper@xxxxxxxxx>
Date: Thu, 1 Jun 2023 10:38:04 -0700
Subject: drm/i915: Fix error handling if driver creation fails during probe
From: Matt Roper <matthew.d.roper@xxxxxxxxx>
commit 718551bbed3ca5308a9f9429305dd074727e8d46 upstream.
If i915_driver_create() fails to create a valid 'i915' object, we
should just disable the PCI device and return immediately without trying
to call i915_probe_error() that relies on a valid i915 pointer.
Fixes: 12e6f6dc78e4 ("drm/i915/display: Handle GMD_ID identification in display code")
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Closes: https://lore.kernel.org/all/55236f93-dcc5-481e-b788-9f7e95b129d8@kili.mountain/
Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
Reviewed-by: Gustavo Sousa <gustavo.sousa@xxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20230601173804.557756-1-matthew.d.roper@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/i915_driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -747,8 +747,8 @@ int i915_driver_probe(struct pci_dev *pd
i915 = i915_driver_create(pdev, ent);
if (IS_ERR(i915)) {
- ret = PTR_ERR(i915);
- goto out_pci_disable;
+ pci_disable_device(pdev);
+ return PTR_ERR(i915);
}
ret = i915_driver_early_probe(i915);
Patches currently in stable-queue which might be from matthew.d.roper@xxxxxxxxx are
queue-6.4/drm-i915-fix-error-handling-if-driver-creation-fails-during-probe.patch
queue-6.4/drm-i915-display-handle-gmd_id-identification-in-display-code.patch
queue-6.4/drm-i915-fix-display-probe-for-ivb-q-and-ivb-d-gt2-server.patch
