| From 09ef58f74329eaa3b2e3ae464851445f8861a7dd Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 27 Jul 2022 15:31:19 +0800 |
| Subject: gpu: lontium-lt9611: Fix NULL pointer dereference in |
| lt9611_connector_init() |
| |
| From: Zeng Jingxiang <linuszeng@tencent.com> |
| |
| [ Upstream commit ef8886f321c5dab8124b9153d25afa2a71d05323 ] |
| |
| A NULL check for bridge->encoder shows that it may be NULL, but it |
| already been dereferenced on all paths leading to the check. |
| 812 if (!bridge->encoder) { |
| |
| Dereference the pointer bridge->encoder. |
| 810 drm_connector_attach_encoder(<9611->connector, bridge->encoder); |
| |
| Signed-off-by: Zeng Jingxiang <linuszeng@tencent.com> |
| Signed-off-by: Robert Foss <robert.foss@linaro.org> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20220727073119.1578972-1-zengjx95@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/bridge/lontium-lt9611.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c |
| index c0b182d1374e..7f688ebd36eb 100644 |
| --- a/drivers/gpu/drm/bridge/lontium-lt9611.c |
| +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c |
| @@ -807,13 +807,14 @@ static int lt9611_connector_init(struct drm_bridge *bridge, struct lt9611 *lt961 |
| |
| drm_connector_helper_add(<9611->connector, |
| <9611_bridge_connector_helper_funcs); |
| - drm_connector_attach_encoder(<9611->connector, bridge->encoder); |
| |
| if (!bridge->encoder) { |
| DRM_ERROR("Parent encoder object not found"); |
| return -ENODEV; |
| } |
| |
| + drm_connector_attach_encoder(<9611->connector, bridge->encoder); |
| + |
| return 0; |
| } |
| |
| -- |
| 2.35.1 |
| |