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

Commit 034b7f3b authored by George Shen's avatar George Shen
Browse files

msm: cvp: Fix page fault when open 16 cvp sessions 



Driver created a new session but used the pointer to the session
without initialized. It happens only after driver detects more
than 16 sessions have been created. The fix is to avoid creating
new session and using of new session in case driver already runs out
of 16 max number of session limit.

Change-Id: Iaf1821a247fe4e087f1b822b9a61e9f151b0acbc
Signed-off-by: default avatarGeorge Shen <sqiao@codeaurora.org>
parent 020d368e

drivers/media/platform/msm/cvp/msm_cvp_core.c

+16 −15
Original line number Diff line number Diff line
@@ -213,8 +213,9 @@ static bool msm_cvp_check_for_inst_overload(struct msm_cvp_core *core) 


	/* Instance count includes current instance as well. */



	if ((instance_count > core->resources.max_inst_count) ||

		(secure_instance_count > core->resources.max_secure_inst_count))

	if ((instance_count >= core->resources.max_inst_count) ||

		(secure_instance_count >=

			core->resources.max_secure_inst_count))

		overload = true;

	return overload;

}
@@ -273,6 +274,19 @@ void *msm_cvp_open(int core_id, int session_type) 
		goto err_invalid_core;

	}



	core->resources.max_inst_count = MAX_SUPPORTED_INSTANCES;

	if (msm_cvp_check_for_inst_overload(core)) {

		dprintk(CVP_ERR, "Instance num reached Max, rejecting session");

		mutex_lock(&core->lock);

		list_for_each_entry(inst, &core->instances, list)

			dprintk(CVP_ERR, "inst %pK, cmd %d id %d\n",

				inst, inst->cur_cmd_type,

				hash32_ptr(inst->session));

		mutex_unlock(&core->lock);



		return NULL;

	}



	inst = kzalloc(sizeof(*inst), GFP_KERNEL);

	if (!inst) {

		dprintk(CVP_ERR, "Failed to allocate memory\n");
@@ -331,19 +345,6 @@ void *msm_cvp_open(int core_id, int session_type) 
		goto fail_init;

	}



	core->resources.max_inst_count = MAX_SUPPORTED_INSTANCES;

	if (msm_cvp_check_for_inst_overload(core)) {

		dprintk(CVP_ERR, "Instance num reached Max, rejecting session");

		mutex_lock(&core->lock);

		list_for_each_entry(inst, &core->instances, list)

			dprintk(CVP_ERR, "inst %pK, cmd %d id %d\n",

				inst, inst->cur_cmd_type,

				hash32_ptr(inst->session));

		mutex_unlock(&core->lock);



		goto fail_init;

	}



	inst->debugfs_root =

		msm_cvp_debugfs_init_inst(inst, core->debugfs_root);