[for-4.4.y,1/5] drm/vc4: Fix NULL deref in HDMI init error path

Message ID 1499544201-12812-2-git-send-email-amit.pundir@linaro.org
State New
Headers show
Series
  • drm/vc4 fixes from rpi-4.4.y for stable
Related show

Commit Message

Amit Pundir July 8, 2017, 8:03 p.m.
From: Eric Anholt <eric@anholt.net>


commit 5883980313af70aec0ceebaef6ef0709726e5e63 upstream.

If you make it here other than through err_destroy_encoder, vc4->hdmi
is still NULL.

Signed-off-by: Eric Anholt <eric@anholt.net>

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.13.0

Patch

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index da9a36d6e1d1..467a650b5105 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -537,7 +537,7 @@  err_unprepare_hsm:
 err_unprepare_pix:
 	clk_disable_unprepare(hdmi->pixel_clock);
 err_put_i2c:
-	put_device(&vc4->hdmi->ddc->dev);
+	put_device(&hdmi->ddc->dev);
 
 	return ret;
 }