From a73a482f7600ebd449117a578b65c4bd983c1d78 Mon Sep 17 00:00:00 2001 From: Ayush Kumar Date: Fri, 20 Nov 2020 20:53:19 +0530 Subject: [PATCH] msm: camera: isp: Add null check for vfe out res data Fixes the null pointer dereference in the get Constraint error function. CRs-Fixed: 2825045 Change-Id: I72d8e51257fcfeca8386e626cf04db448bf3b483 Signed-off-by: Ayush Kumar --- .../isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c index 40bf742754..2823615077 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c @@ -862,6 +862,11 @@ static void cam_vfe_bus_ver3_get_constraint_errors( for (i = 0; i < bus_priv->num_out; i++) { out_rsrc_node = &bus_priv->vfe_out[i]; + if (!out_rsrc_node || !out_rsrc_node->res_priv) { + CAM_DBG(CAM_ISP, + "Vfe out:%d out rsrc node or data is NULL", i); + continue; + } out_rsrc_data = out_rsrc_node->res_priv; for (j = 0; j < out_rsrc_data->num_wm; j++) { wm_data = out_rsrc_data->wm_res[j].res_priv;