evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: fix possible NULL pointer dereferences

Browse source 
Fix few NULL pointer dereferences in dsi and rotator.

Change-Id: Icc1a8e744dad287445474908cc96c21c5bb66751
(cherry picked from commit 5549fcb68e4d8f8e0551754cddefc5d8ffd557d7)
[rameezmustafa@codeaurora.org: Resolve merge conflict in mdss_dsi_host.c]
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
This commit is contained in:
Veera Sundaram Sankaran 2015-02-17 18:10:36 -08:00 • committed by David Keitel
parent d6bc431a14
commit c5aedfabd2
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/fbdev/msm/mdss_dsi_host.c
View file

@ -1982,6 +1982,9 @@ int mdss_dsi_cmdlist_commit(struct mdss_dsi_ctrl_pdata *ctrl, int from_mdp)
MDSS_XLOG(ctrl->ndx, from_mdp, ctrl->mdp_busy, current->pid, MDSS_XLOG(ctrl->ndx, from_mdp, ctrl->mdp_busy, current->pid,
XLOG_FUNC_ENTRY); XLOG_FUNC_ENTRY);
if (req == NULL)
goto need_lock;
/* make sure dsi_cmd_mdp is idle */ /* make sure dsi_cmd_mdp is idle */
mdss_dsi_cmd_mdp_busy(ctrl); mdss_dsi_cmd_mdp_busy(ctrl);
@ -2009,10 +2012,6 @@ int mdss_dsi_cmdlist_commit(struct mdss_dsi_ctrl_pdata *ctrl, int from_mdp)
mdss_dsi_cmd_start_hs_clk_lane(ctrl); mdss_dsi_cmd_start_hs_clk_lane(ctrl);
} }
if (req == NULL)
goto need_lock;
MDSS_XLOG(ctrl->ndx, req->flags, req->cmds_cnt, from_mdp, current->pid); MDSS_XLOG(ctrl->ndx, req->flags, req->cmds_cnt, from_mdp, current->pid);
/* /*

3
drivers/video/fbdev/msm/mdss_mdp_rotator.c
View file

@ -194,7 +194,8 @@ static struct mdss_mdp_rot_pipe *mdss_mdp_rot_mgr_acquire_pipe(
pr_debug("find a free pipe %p\n", rot_pipe->pipe); pr_debug("find a free pipe %p\n", rot_pipe->pipe);
} else { } else {
rot_pipe = busy_rot_pipe; rot_pipe = busy_rot_pipe;
pr_debug("find a busy pipe %p\n", rot_pipe->pipe); if (rot_pipe)
pr_debug("find a busy pipe %p\n", rot_pipe->pipe);
} }
if (rot_pipe) if (rot_pipe)