diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-10 15:14:23 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-10 15:14:23 -0800 |
| commit | 26ef63d686a907cb34407ea634ddb7ca60cb8ef8 (patch) | |
| tree | a206fdf0dbea49fc5519bb51f34d22249beafeac /drivers | |
| parent | 194d6b16aaab0844c6645c385a70f5fd15150fda (diff) | |
| parent | 420d51e0733e72830fa591f1e67f5a40ce11dc51 (diff) | |
Merge "qseecom: remove entry from qseecom_registered_app_list"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/qseecom.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index 0bed86d2ccc0..7dc7271b05c1 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -2184,6 +2184,7 @@ static int qseecom_load_app(struct qseecom_dev_handle *data, void __user *argp) struct qseecom_load_app_64bit_ireq load_req_64bit; void *cmd_buf = NULL; size_t cmd_len; + bool first_time = false; /* Copy the relevant information needed for loading the image */ if (copy_from_user(&load_img_req, @@ -2255,6 +2256,7 @@ static int qseecom_load_app(struct qseecom_dev_handle *data, void __user *argp) &qseecom.registered_app_list_lock, flags); ret = 0; } else { + first_time = true; pr_warn("App (%s) does'nt exist, loading apps for first time\n", (char *)(load_img_req.img_name)); /* Get the handle of the shared fd */ @@ -2386,8 +2388,15 @@ static int qseecom_load_app(struct qseecom_dev_handle *data, void __user *argp) load_img_req.app_id = app_id; if (copy_to_user(argp, &load_img_req, sizeof(load_img_req))) { pr_err("copy_to_user failed\n"); - kzfree(entry); ret = -EFAULT; + if (first_time == true) { + spin_lock_irqsave( + &qseecom.registered_app_list_lock, flags); + list_del(&entry->list); + spin_unlock_irqrestore( + &qseecom.registered_app_list_lock, flags); + kzfree(entry); + } } loadapp_err: |