Skip to content

Commit

Permalink
drm/msm: mdp4: Fix drm_framebuffer dereference crash
Browse files Browse the repository at this point in the history
mdp4_get_frame_format() can dereference a drm_framebuffer when it's NULL.
Call it in mdp4_plane_mode_set only when we know fb is non-NULL.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
  • Loading branch information
Archit Taneja authored and Rob Clark committed Jul 29, 2015
1 parent ac45146 commit a1c3e3e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,15 @@ static int mdp4_plane_mode_set(struct drm_plane *plane,
uint32_t op_mode = 0;
uint32_t phasex_step = MDP4_VG_PHASE_STEP_DEFAULT;
uint32_t phasey_step = MDP4_VG_PHASE_STEP_DEFAULT;
enum mdp4_frame_format frame_type = mdp4_get_frame_format(fb);
enum mdp4_frame_format frame_type;

if (!(crtc && fb)) {
DBG("%s: disabled!", mdp4_plane->name);
return 0;
}

frame_type = mdp4_get_frame_format(fb);

/* src values are in Q16 fixed point, convert to integer: */
src_x = src_x >> 16;
src_y = src_y >> 16;
Expand Down

0 comments on commit a1c3e3e

Please sign in to comment.