aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuai-Yuan Liu <[email protected]>2024-04-07 06:30:53 +0000
committerLiviu Dudau <[email protected]>2024-04-12 11:57:59 +0000
commita1f95aede6285dba6dd036d907196f35ae3a11ea (patch)
tree2eede0fd00c3e6df39f8e860b128469e2d8568a0
parentdrm/i915: Add SIZE_HINTS property for cursors (diff)
downloadkernel-a1f95aede6285dba6dd036d907196f35ae3a11ea.tar.gz
kernel-a1f95aede6285dba6dd036d907196f35ae3a11ea.zip
drm/arm/malidp: fix a possible null pointer dereference
In malidp_mw_connector_reset, new memory is allocated with kzalloc, but no check is performed. In order to prevent null pointer dereferencing, ensure that mw_state is checked before calling __drm_atomic_helper_connector_reset. Fixes: 8cbc5caf36ef ("drm: mali-dp: Add writeback connector") Signed-off-by: Huai-Yuan Liu <[email protected]> Signed-off-by: Liviu Dudau <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r--drivers/gpu/drm/arm/malidp_mw.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c
index 626709bec6f5..2577f0cef8fc 100644
--- a/drivers/gpu/drm/arm/malidp_mw.c
+++ b/drivers/gpu/drm/arm/malidp_mw.c
@@ -72,7 +72,10 @@ static void malidp_mw_connector_reset(struct drm_connector *connector)
__drm_atomic_helper_connector_destroy_state(connector->state);
kfree(connector->state);
- __drm_atomic_helper_connector_reset(connector, &mw_state->base);
+ connector->state = NULL;
+
+ if (mw_state)
+ __drm_atomic_helper_connector_reset(connector, &mw_state->base);
}
static enum drm_connector_status