diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-21 09:14:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-21 09:14:44 -0700 |
| commit | d97979c76786eaee7e81331de2b49f3fdf821426 (patch) | |
| tree | 9bb68aabdd9936d70bd025d990a5492116ec4b3d | |
| parent | 727593cbf7ebb6782b2b3b45a951cc8ccc03a788 (diff) | |
| parent | 3dc27e3392c582d0f5ad20db3690b122a3a236b1 (diff) | |
Merge "qseecom: fix kclient free issue in qseecom_remove"
| -rw-r--r-- | drivers/misc/qseecom.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index f0140e8bbe68..e85b2b8972c9 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -8743,11 +8743,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); @@ -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); if (qseecom.qseos_version > QSEEE_VERSION_00) |