From 665a666fc792ff9e40601b2b4e9cdcc8e9d08924 Mon Sep 17 00:00:00 2001 From: Shalini Krishnamoorthi Date: Tue, 21 Jun 2016 15:50:05 -0700 Subject: [PATCH] msm: mdss: Add null check for dma buffer memory The dma buffer is checked only for error and not null. Changes are added to check if the buffer is null to prevent accessing invalid MUTEX lock or invalid dma buffer memory. CRs-Fixed: 1032180 Change-Id: Ia1ed1238b084d04eb787d078f7bb47a4e2a62a8a Signed-off-by: Shalini Krishnamoorthi --- drivers/video/fbdev/msm/mdss_mdp_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_util.c b/drivers/video/fbdev/msm/mdss_mdp_util.c index 199c2b66d90e..35ea5d8b4394 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_util.c +++ b/drivers/video/fbdev/msm/mdss_mdp_util.c @@ -1027,7 +1027,7 @@ static int mdss_mdp_get_img(struct msmfb_data *img, } else if (iclient) { if (mdss_mdp_is_map_needed(mdata, data)) { data->srcp_dma_buf = dma_buf_get(img->memory_id); - if (IS_ERR(data->srcp_dma_buf)) { + if (IS_ERR_OR_NULL(data->srcp_dma_buf)) { pr_err("error on ion_import_fd\n"); ret = PTR_ERR(data->srcp_dma_buf); data->srcp_dma_buf = NULL;