evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "qseecom: check error return value of ion_map_kernel"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-31 13:04:15 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9f610da312
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/misc/qseecom.c
View file

@ -1065,6 +1065,10 @@ static int __qseecom_set_sb_memory(struct qseecom_registered_listener_list *svc,
} }
/* Populate the structure for sending scm call to load image */ /* Populate the structure for sending scm call to load image */
svc->sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt, svc->ihandle); svc->sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt, svc->ihandle);
if (IS_ERR_OR_NULL(svc->sb_virt)) {
pr_err("ION memory mapping for listener shared buffer failed\n");
return -ENOMEM;
}
svc->sb_phys = (phys_addr_t)pa; svc->sb_phys = (phys_addr_t)pa;
if (qseecom.qsee_version < QSEE_VERSION_40) { if (qseecom.qsee_version < QSEE_VERSION_40) {
@ -1522,6 +1526,10 @@ static int qseecom_set_client_mem_param(struct qseecom_dev_handle *data,
/* Populate the structure for sending scm call to load image */ /* Populate the structure for sending scm call to load image */
data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt, data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt,
data->client.ihandle); data->client.ihandle);
if (IS_ERR_OR_NULL(data->client.sb_virt)) {
pr_err("ION memory mapping for client shared buf failed\n");
return -ENOMEM;
}
data->client.sb_phys = (phys_addr_t)pa; data->client.sb_phys = (phys_addr_t)pa;
data->client.sb_length = req.sb_len; data->client.sb_length = req.sb_len;
data->client.user_virt_sb_base = (uintptr_t)req.virt_sb_base; data->client.user_virt_sb_base = (uintptr_t)req.virt_sb_base;
@ -4203,6 +4211,11 @@ int qseecom_start_app(struct qseecom_handle **handle,
/* Populate the structure for sending scm call to load image */ /* Populate the structure for sending scm call to load image */
data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt, data->client.sb_virt = (char *) ion_map_kernel(qseecom.ion_clnt,
data->client.ihandle); data->client.ihandle);
if (IS_ERR_OR_NULL(data->client.sb_virt)) {
pr_err("ION memory mapping for client shared buf failed\n");
ret = -ENOMEM;
goto err;
}
data->client.user_virt_sb_base = (uintptr_t)data->client.sb_virt; data->client.user_virt_sb_base = (uintptr_t)data->client.sb_virt;
data->client.sb_phys = (phys_addr_t)pa; data->client.sb_phys = (phys_addr_t)pa;
(*handle)->dev = (void *)data; (*handle)->dev = (void *)data;