From c5aedfabd25342549ee7dd6f7606b9bb556459cf Mon Sep 17 00:00:00 2001 From: Veera Sundaram Sankaran Date: Tue, 17 Feb 2015 18:10:36 -0800 Subject: [PATCH] msm: mdss: fix possible NULL pointer dereferences 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 --- drivers/video/fbdev/msm/mdss_dsi_host.c | 7 +++---- drivers/video/fbdev/msm/mdss_mdp_rotator.c | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_dsi_host.c b/drivers/video/fbdev/msm/mdss_dsi_host.c index 840db69653b5..ee358004d10a 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_host.c +++ b/drivers/video/fbdev/msm/mdss_dsi_host.c @@ -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, XLOG_FUNC_ENTRY); + if (req == NULL) + goto need_lock; + /* make sure dsi_cmd_mdp is idle */ 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); } - - if (req == NULL) - goto need_lock; - MDSS_XLOG(ctrl->ndx, req->flags, req->cmds_cnt, from_mdp, current->pid); /* diff --git a/drivers/video/fbdev/msm/mdss_mdp_rotator.c b/drivers/video/fbdev/msm/mdss_mdp_rotator.c index 86c61703b6d1..56f359849849 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_rotator.c +++ b/drivers/video/fbdev/msm/mdss_mdp_rotator.c @@ -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); } else { 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)