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

Commit a0209303 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Fix accessing invalid instance"

parents f9d7e36b cc6897b4

drivers/media/platform/msm/vidc/msm_vidc_common.c

+8 −2
Original line number Diff line number Diff line
@@ -2614,6 +2614,7 @@ int msm_comm_check_core_init(struct msm_vidc_core *core) 
	int rc = 0;

	struct hfi_device *hdev;

	struct msm_vidc_inst *inst = NULL;

	int dref = 0;



	mutex_lock(&core->lock);

	if (core->state >= VIDC_CORE_INIT_DONE) {
@@ -2637,11 +2638,16 @@ int msm_comm_check_core_init(struct msm_vidc_core *core) 
		 * Just grab one of the inst from instances list and

		 * use it.

		 */

		inst = list_first_entry(&core->instances,

		inst = list_first_entry_or_null(&core->instances,

			struct msm_vidc_inst, list);

		if (inst)

			dref = kref_get_unless_zero(&inst->kref);



		mutex_unlock(&core->lock);

		if (dref) {

			msm_comm_print_debug_info(inst);

			put_inst(inst);

		}

		mutex_lock(&core->lock);



		BUG_ON(msm_vidc_debug_timeout);