Merge "msm: camera: icp: Validate ctx during hw release" into dev/msm-4.9-camx (5851a268) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -2447,9 +2447,16 @@ static int cam_icp_mgr_release_hw(void hw_mgr_priv, void release_hw_args)
		}

		ctx_data = release_hw->ctxt_to_hw_map;
		if (!ctx_data) {
		CAM_ERR(CAM_ICP, "NULL ctx");
		return -EINVAL;
		}

		ctx_id = ctx_data->ctx_id;
		if (ctx_id < 0 \|\| ctx_id >= CAM_ICP_CTX_MAX)
		if (ctx_id < 0 \|\| ctx_id >= CAM_ICP_CTX_MAX) {
		CAM_ERR(CAM_ICP, "Invalid ctx id: %d", ctx_id);
		return -EINVAL;
		}

		mutex_lock(&hw_mgr->ctx_data[ctx_id].ctx_mutex);
		if (!hw_mgr->ctx_data[ctx_id].in_use) {