Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e4bc937 authored by Harsh Shah's avatar Harsh Shah Committed by Karthik Anantha Ram
Browse files

msm: camera: isp: Unlink in activated state 



Without supporting unlink in activated state, CRM will release the
link and free the resources. This will cause NULL crash or slab
memory corruption.

Change-Id: Iad8d673445cbc511328de472d9b1f6a2bb51ece7
Signed-off-by: default avatarHarsh Shah <harshs@codeaurora.org>
parent 66fcd11c

drivers/media/platform/msm/camera/cam_isp/cam_isp_context.c

+19 −0
Original line number Diff line number Diff line
@@ -2005,6 +2005,24 @@ static int __cam_isp_ctx_release_dev_in_activated(struct cam_context *ctx, 
	return rc;

}



static int __cam_isp_ctx_unlink_in_activated(struct cam_context *ctx,

	struct cam_req_mgr_core_dev_link_setup *unlink)

{

	int rc = 0;



	CAM_WARN(CAM_ISP,

		"Received unlink in activated state. It's unexpected");

	rc = __cam_isp_ctx_stop_dev_in_activated_unlock(ctx);

	if (rc)

		CAM_WARN(CAM_ISP, "Stop device failed rc=%d", rc);



	rc = __cam_isp_ctx_unlink_in_ready(ctx, unlink);

	if (rc)

		CAM_ERR(CAM_ISP, "Unlink failed rc=%d", rc);



	return rc;

}



static int __cam_isp_ctx_apply_req(struct cam_context *ctx,

	struct cam_req_mgr_apply_request *apply)

{
@@ -2116,6 +2134,7 @@ static struct cam_ctx_ops 
			.config_dev = __cam_isp_ctx_config_dev_in_top_state,

		},

		.crm_ops = {

			.unlink = __cam_isp_ctx_unlink_in_activated,

			.apply_req = __cam_isp_ctx_apply_req,

			.flush_req = __cam_isp_ctx_flush_req_in_top_state,

		},