Merge "qseecom: fix kclient free issue in qseecom_remove"

This commit is contained in:
Linux Build Service Account 2018-09-21 09:14:44 -07:00 committed by Gerrit - the friendly Code Review server
commit d97979c767

View file

@ -8743,11 +8743,11 @@ static int qseecom_remove(struct platform_device *pdev)
&qseecom.registered_kclient_list_head, list) { &qseecom.registered_kclient_list_head, list) {
/* Break the loop if client handle is NULL */ /* Break the loop if client handle is NULL */
if (!kclient->handle) if (!kclient->handle) {
goto exit_free_kclient; list_del(&kclient->list);
kzfree(kclient);
if (list_empty(&kclient->list)) break;
goto exit_free_kc_handle; }
list_del(&kclient->list); list_del(&kclient->list);
mutex_lock(&app_access_lock); mutex_lock(&app_access_lock);
@ -8760,11 +8760,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); spin_unlock_irqrestore(&qseecom.registered_kclient_list_lock, flags);
if (qseecom.qseos_version > QSEEE_VERSION_00) if (qseecom.qseos_version > QSEEE_VERSION_00)