diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2020-12-15 16:42:38 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-12-16 10:11:32 +0100 |
| commit | e55a07751146ef8ebc2c561564437b78f46405d3 (patch) | |
| tree | 88b03dec5ddc6238406249caa473a3005527992e | |
| parent | drm/vc4: hdmi: Take into account the clock doubling flag in atomic_check (diff) | |
| download | linux-e55a07751146ef8ebc2c561564437b78f46405d3.tar.xz linux-e55a07751146ef8ebc2c561564437b78f46405d3.zip | |
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>
Link: https://patchwork.freedesktop.org/patch/msgid/20201215154243.540115-5-maxime@cerno.tech
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 3dac839b0fa5..920895deb2e7 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -171,7 +171,9 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) 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 = { |