Merge "qseecom: fix kclient free issue in qseecom_remove" (fc401b6a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/misc/qseecom.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -8792,11 +8792,11 @@ static int qseecom_remove(struct platform_device *pdev)
		&qseecom.registered_kclient_list_head, list) {

		/* Break the loop if client handle is NULL */
		if (!kclient->handle)
		goto exit_free_kclient;

		if (list_empty(&kclient->list))
		goto exit_free_kc_handle;
		if (!kclient->handle) {
		list_del(&kclient->list);
		kzfree(kclient);
		break;
		}

		list_del(&kclient->list);
		mutex_lock(&app_access_lock);
		@@ -8809,11 +8809,6 @@ static int qseecom_remove(struct platform_device *pdev)
		}
		}

		exit_free_kc_handle:
		kzfree(kclient->handle);
		exit_free_kclient:
		kzfree(kclient);

		spin_unlock_irqrestore(&qseecom.registered_kclient_list_lock, flags);

		if (qseecom.qseos_version > QSEEE_VERSION_00)