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

Commit 7520ed69 authored by Alok Chauhan's avatar Alok Chauhan
Browse files

msm: camera: ope: Add a check for valid request in cdm callback 



Add a check in cdm callback helper function to make sure
request is valid and same request is not processed again.

CRs-Fixed: 2595373
Change-Id: I3913059671907c6d3b324721d60914962e4e973f
Signed-off-by: default avatarAlok Chauhan <alokc@codeaurora.org>
parent d09df6b7

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

+15 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/uaccess.h>
@@ -1112,13 +1112,25 @@ static void cam_ope_ctx_cdm_callback(uint32_t handle, void *userdata, 
		return;

	}



	CAM_DBG(CAM_FD, "CDM hdl=%x, udata=%pK, status=%d, cookie=%llu",

	CAM_DBG(CAM_OPE, "CDM hdl=%x, udata=%pK, status=%d, cookie=%llu",

		handle, userdata, status, cookie);



	ctx = userdata;

	ope_req = ctx->req_list[cookie];



	mutex_lock(&ctx->ctx_mutex);



	if (cookie >= CAM_CTX_REQ_MAX) {

		CAM_ERR(CAM_OPE, "Invalid reqIdx = %llu", cookie);

		goto end;

	}



	if (!test_bit(cookie, ctx->bitmap)) {

		CAM_INFO(CAM_OPE, "Request not present reqIdx = %d", cookie);

		goto end;

	}



	ope_req = ctx->req_list[cookie];



	if (ctx->ctx_state != OPE_CTX_STATE_ACQUIRED) {

		CAM_DBG(CAM_OPE, "ctx %u is in %d state",

			ctx->ctx_id, ctx->ctx_state);