[PATCH v2] drm/meson: fix potential NULL pointer exception in meson_drv_unbind()
flat view
STALE1943d
From: Jiajun Cao <hidden>
Date: 2021-06-18 05:28:45
Also in:
dri-devel, linux-amlogic, lkml
Subsystem:
drm drivers, drm drivers and misc gpu patches, drm drivers for amlogic socs, the rest · Maintainers:
David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Neil Armstrong, Linus Torvalds
Fix a potential NULL pointer exception when meson_drv_unbind() attempts to operate on the driver_data priv which may be NULL. Add a null pointer check on the priv struct to avoid the NULL pointer dereference after calling dev_get_drvdata(), just like the null pointer checks done on the struct priv in the function meson_drv_shutdown(), meson_drv_pm_suspend() and meson_drv_pm_resume(). Signed-off-by: Jiajun Cao <redacted> Signed-off-by: Xin Tan <redacted> --- drivers/gpu/drm/meson/meson_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
index 07fcd12dca16..f544fba8c44e 100644
--- a/drivers/gpu/drm/meson/meson_drv.c
+++ b/drivers/gpu/drm/meson/meson_drv.c@@ -380,7 +380,10 @@ static int meson_drv_bind(struct device *dev) static void meson_drv_unbind(struct device *dev) { struct meson_drm *priv = dev_get_drvdata(dev); - struct drm_device *drm = priv->drm; + struct drm_device *drm; + + if (!priv) + return; if (priv->canvas) { meson_canvas_free(priv->canvas, priv->canvas_id_osd1);
@@ -389,6 +392,7 @@ static void meson_drv_unbind(struct device *dev) meson_canvas_free(priv->canvas, priv->canvas_id_vd1_2); } + drm = priv->drm; drm_dev_unregister(drm); drm_kms_helper_poll_fini(drm); drm_atomic_helper_shutdown(drm);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel