drm: mxsfb: Fix NULL pointer dereference
authorAlexander Stein <alexander.stein@ew.tq-group.com>
Wed, 2 Feb 2022 08:17:55 +0000 (09:17 +0100)
committerMarek Vasut <marex@denx.de>
Thu, 3 Feb 2022 08:31:16 +0000 (09:31 +0100)
mxsfb should not ever dereference the NULL pointer which
drm_atomic_get_new_bridge_state is allowed to return.
Assume a fixed format instead.

Fixes: b776b0f00f24 ("drm: mxsfb: Use bus_format from the nearest bridge if present")
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220202081755.145716-3-alexander.stein@ew.tq-group.com
drivers/gpu/drm/mxsfb/mxsfb_kms.c

index 0655582ae8ed64f2e7eb822a229f69b992aae69a..4cfb6c001679924801bdd37ffdb1455f753409dc 100644 (file)
@@ -361,7 +361,11 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
                bridge_state =
                        drm_atomic_get_new_bridge_state(state,
                                                        mxsfb->bridge);
-               bus_format = bridge_state->input_bus_cfg.format;
+               if (!bridge_state)
+                       bus_format = MEDIA_BUS_FMT_FIXED;
+               else
+                       bus_format = bridge_state->input_bus_cfg.format;
+
                if (bus_format == MEDIA_BUS_FMT_FIXED) {
                        dev_warn_once(drm->dev,
                                      "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"