mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 19:46:51 +00:00
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
|
From e1b4f5c3970e14abe197f328077b348b4969e68f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Tue, 15 Dec 2020 16:42:38 +0100
|
||
|
|
Subject: [PATCH] drm/vc4: hdmi: Don't access the connector state in
|
||
|
|
reset if kmalloc fails
|
||
|
|
|
||
|
|
drm_atomic_helper_connector_reset uses kmalloc which, from an API
|
||
|
|
standpoint, can fail, and thus setting connector->state to NULL.
|
||
|
|
However, our reset hook then calls drm_atomic_helper_connector_tv_reset
|
||
|
|
that will access connector->state without checking if it's a valid
|
||
|
|
pointer or not.
|
||
|
|
|
||
|
|
Make sure we don't end up accessing a NULL pointer.
|
||
|
|
|
||
|
|
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
|
||
|
|
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Suggested-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||
|
|
@@ -215,7 +215,9 @@ static int vc4_hdmi_connector_get_modes(
|
||
|
|
static void vc4_hdmi_connector_reset(struct drm_connector *connector)
|
||
|
|
{
|
||
|
|
drm_atomic_helper_connector_reset(connector);
|
||
|
|
- drm_atomic_helper_connector_tv_reset(connector);
|
||
|
|
+
|
||
|
|
+ if (connector->state)
|
||
|
|
+ drm_atomic_helper_connector_tv_reset(connector);
|
||
|
|
}
|
||
|
|
|
||
|
|
static const struct drm_connector_funcs vc4_hdmi_connector_funcs = {
|