diff options
| author |   Archit Taneja <architt@codeaurora.org> | 2015-06-26 15:49:43 +0530 |
|---|---|---|
| committer |   Rob Clark <robdclark@gmail.com> | 2015-07-29 16:38:24 -0400 |
| commit | a1c3e3e01ee301de6a13e696ef8775f40ca339ac (patch) | |
| tree | c045363a0ddf5a1563b5c2e95b0416904e48b760 /drivers/gpu/drm/msm | |
| parent | drm/msm: fix msm_gem_prime_get_sg_table() (diff) | |
| download | linux-dev-a1c3e3e01ee301de6a13e696ef8775f40ca339ac.tar.xz linux-dev-a1c3e3e01ee301de6a13e696ef8775f40ca339ac.zip | |
drm/msm: mdp4: Fix drm_framebuffer dereference crash
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>
Diffstat (limited to 'drivers/gpu/drm/msm')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c index 0d1dbb737933..247a424445f7 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c @@ -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; |