This is a note to let you know that I've just added the patch titled
drm/msm: fix NULL-deref on irq uninstall
to the 6.1-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-msm-fix-null-deref-on-irq-uninstall.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From cd459c005de3e2b855a8cc7768e633ce9d018e9f Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Mon, 6 Mar 2023 11:07:16 +0100
Subject: drm/msm: fix NULL-deref on irq uninstall
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit cd459c005de3e2b855a8cc7768e633ce9d018e9f upstream.
In case of early initialisation errors and on platforms that do not use
the DPU controller, the deinitilisation code can be called with the kms
pointer set to NULL.
Fixes: f026e431cf86 ("drm/msm: Convert to Linux IRQ interfaces")
Cc: stable@xxxxxxxxxxxxxxx # 5.14
Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Patchwork: https://patchwork.freedesktop.org/patch/525104/
Link: https://lore.kernel.org/r/20230306100722.28485-5-johan+linaro@xxxxxxxxxx
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/msm_drv.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -250,9 +250,11 @@ static int msm_drm_uninit(struct device
drm_bridge_remove(priv->bridges[i]);
priv->num_bridges = 0;
- pm_runtime_get_sync(dev);
- msm_irq_uninstall(ddev);
- pm_runtime_put_sync(dev);
+ if (kms) {
+ pm_runtime_get_sync(dev);
+ msm_irq_uninstall(ddev);
+ pm_runtime_put_sync(dev);
+ }
if (kms && kms->funcs)
kms->funcs->destroy(kms);
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.1/drm-msm-fix-vram-leak-on-bind-errors.patch
queue-6.1/drm-msm-adreno-fix-runtime-pm-imbalance-at-gpu-load.patch
queue-6.1/drm-msm-fix-workqueue-leak-on-bind-errors.patch
queue-6.1/drm-msm-fix-drm-device-leak-on-bind-errors.patch
queue-6.1/drm-msm-fix-null-deref-on-irq-uninstall.patch
queue-6.1/usb-dwc3-gadget-drop-dead-hibernation-code.patch
queue-6.1/drm-msm-fix-null-deref-on-snapshot-tear-down.patch
