Skip to content

Commit

Permalink
drm/sun4i: tcon: prevent tcon->panel dereference if NULL
Browse files Browse the repository at this point in the history
If tcon->panel pointer is NULL, trying to dereference from it
(i.e. tcon->panel->connector) will cause a null pointer dereference.

Add tcon->panel null pointer check before calling
sun4i_tcon0_mode_set_dithering().

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
Fixes: f11adce ("drm/sun4i: tcon: Add dithering support for
                      RGB565/RGB666 LCD panels")
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181005215951.99003-2-giulio.benetti@micronovasrl.com
  • Loading branch information
Giulio Benetti authored and Maxime Ripard committed Oct 8, 2018
1 parent 548ae86 commit 49c5c07
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/sun4i/sun4i_tcon.c
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,8 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
sun4i_tcon0_mode_set_common(tcon, mode);

/* Set dithering if needed */
sun4i_tcon0_mode_set_dithering(tcon, tcon->panel->connector);
if (tcon->panel)
sun4i_tcon0_mode_set_dithering(tcon, tcon->panel->connector);

/* Adjust clock delay */
clk_delay = sun4i_tcon_get_clk_delay(mode, 0);
Expand Down

0 comments on commit 49c5c07

Please sign in to comment.