Skip to content

Commit 622c9a3

Browse files
tq-steinaMarek Vasut
authored andcommitted
drm: mxsfb: Fix NULL pointer dereference
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: b776b0f ("drm: mxsfb: Use bus_format from the nearest bridge if present") Signed-off-by: Alexander Stein <[email protected]> Signed-off-by: Marek Vasut <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent a3f781a commit 622c9a3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/gpu/drm/mxsfb/mxsfb_kms.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,11 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
361361
bridge_state =
362362
drm_atomic_get_new_bridge_state(state,
363363
mxsfb->bridge);
364-
bus_format = bridge_state->input_bus_cfg.format;
364+
if (!bridge_state)
365+
bus_format = MEDIA_BUS_FMT_FIXED;
366+
else
367+
bus_format = bridge_state->input_bus_cfg.format;
368+
365369
if (bus_format == MEDIA_BUS_FMT_FIXED) {
366370
dev_warn_once(drm->dev,
367371
"Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"

0 commit comments

Comments
 (0)