From 672bb852c3ab0cfab3cf8a1875fe6c0ec07fd199 Mon Sep 17 00:00:00 2001 From: Sree Sesha Aravind Vadrevu Date: Thu, 6 Jun 2013 10:40:39 -0700 Subject: msm: mdss: Avoid null pointer deref in writeback terminate Writeback terminate can be called without the allocation of ctl especially when a file descriptor needs to be closed for ioctl failures. CRs-fixed: 489296 Change-Id: I907d3f9ba1825829b3198f66c918071e59d37968 Signed-off-by: Sree Sesha Aravind Vadrevu --- drivers/video/fbdev/msm/mdss_mdp_wb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_wb.c b/drivers/video/fbdev/msm/mdss_mdp_wb.c index 1f8244d342f4..0bb68f9128b5 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_wb.c +++ b/drivers/video/fbdev/msm/mdss_mdp_wb.c @@ -251,8 +251,8 @@ static int mdss_mdp_wb_terminate(struct msm_fb_data_type *mfd) if (wb->secure_pipe) mdss_mdp_pipe_destroy(wb->secure_pipe); mutex_unlock(&wb->lock); - - mdp5_data->ctl->is_secure = false; + if (mdp5_data->ctl) + mdp5_data->ctl->is_secure = false; mdp5_data->wb = NULL; mutex_unlock(&mdss_mdp_wb_buf_lock); -- cgit v1.2.3