From 29b44c203401d6a940bd2b92cc8c94bebccc1688 Mon Sep 17 00:00:00 2001 From: Shobhit Singh Date: Tue, 26 Jun 2018 18:45:40 +0530 Subject: [PATCH] msm: camera: isp: Add null check for vfe_dev. In some cases, observed that vfe node information is not filled in the stream information, this will lead to a null pointer access. To avoid such scenarios, a null check is added. Change-Id: Ibe8e095629574e2d8b8fbb097449d49bc0a762b3 Signed-off-by: Shobhit Singh --- drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c index 925a89601636..da4db983f367 100644 --- a/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c +++ b/drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c @@ -528,6 +528,12 @@ static void msm_isp_cfg_framedrop_reg( enum msm_vfe_input_src frame_src = SRC_TO_INTF(stream_info->stream_src); int i; + if (vfe_dev == NULL) { + pr_err("%s %d returning vfe_dev is NULL\n", + __func__, __LINE__); + return; + } + if (vfe_dev->axi_data.src_info[frame_src].frame_id >= stream_info->init_frame_drop) runtime_init_frame_drop = 0;