mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-11 08:54:28 -05:00
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
|
From 0ed0f061bcd71940ed65de2ba46e37e709e31471 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mallikarjuna Reddy Amireddy <mamire@codeaurora.org>
|
||
|
|
Date: Tue, 22 Nov 2016 17:24:46 +0530
|
||
|
|
Subject: qseecom: remove entry from qseecom_registered_app_list
|
||
|
|
|
||
|
|
In an error handling case, the QSEECOM_IOCTL_LOAD_APP_REQ ioctl
|
||
|
|
freed the entry for new TA, but didn't removed it from
|
||
|
|
qseecom_registered_app_list. Make change to remove it.
|
||
|
|
|
||
|
|
Change-Id: Id681fbf3c923027d3db875d506cbe3f971919a8d
|
||
|
|
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
|
||
|
|
Signed-off-by: Mallikarjuna Reddy Amireddy <mamire@codeaurora.org>
|
||
|
|
---
|
||
|
|
drivers/misc/qseecom.c | 11 ++++++++++-
|
||
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
|
||
|
|
index b1c97ba..270fb95 100644
|
||
|
|
--- a/drivers/misc/qseecom.c
|
||
|
|
+++ b/drivers/misc/qseecom.c
|
||
|
|
@@ -1349,6 +1349,7 @@ static int qseecom_load_app(struct qseecom_dev_handle *data, void __user *argp)
|
||
|
|
struct qseecom_command_scm_resp resp;
|
||
|
|
struct qseecom_check_app_ireq req;
|
||
|
|
struct qseecom_load_app_ireq load_req;
|
||
|
|
+ bool first_time = false;
|
||
|
|
|
||
|
|
/* Copy the relevant information needed for loading the image */
|
||
|
|
if (copy_from_user(&load_img_req,
|
||
|
|
@@ -1395,6 +1396,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 */
|
||
|
|
@@ -1499,8 +1501,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:
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|