A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qseecom: Invalidate the buffer after listener operation

Browse source 
Listener operation switches the context between secure and
non-secure world while user requested qseecom operation is
put to wait. Between lisetner operation start and finish CPU
can do a speculative data fetch before secure world updates
the physical memory of user requested response data buffer which
was waiting in qseecom for listener operation to complete. This
speculative fetch will pull old data from RAM to cache and user
will end up reading stale data. Fix this by invalidating the
response data dma buffer after listener call completes. Also remove the
invalidate call for listener dma after scm call as data will not
be accessed in kernel after scm call is completed.

Change-Id: I68730a17b515f07a71a040a534f97ce97c65026c
Signed-off-by: Neeraj Soni <neersoni@codeaurora.org>
This commit is contained in:
Neeraj Soni 2020-03-08 15:44:20 +05:30 • committed by Gerrit - the friendly Code Review server
commit 81feae3952
1 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/misc/qseecom.c
View file

@ -2273,10 +2273,6 @@ err_resp:
goto exit;
}
ret = qseecom_dmabuf_cache_operations(ptr_svc->dmabuf,
QSEECOM_CACHE_INVALIDATE);
if (ret)
goto exit;
} else {
ret = qseecom_scm_call(SCM_SVC_TZSCHEDULER, 1,
cmd_buf, cmd_len, resp, sizeof(*resp));
@ -2608,10 +2604,6 @@ err_resp:
ret, data->client.app_id);
goto exit;
}
ret = qseecom_dmabuf_cache_operations(ptr_svc->dmabuf,
QSEECOM_CACHE_INVALIDATE);
if (ret)
goto exit;
} else {
ret = qseecom_scm_call(SCM_SVC_TZSCHEDULER, 1,
cmd_buf, cmd_len, resp, sizeof(*resp));
@ -3772,14 +3764,6 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data,
ret, data->client.app_id);
goto exit;
}
if (data->client.dmabuf) {
ret = qseecom_dmabuf_cache_operations(data->client.dmabuf,
QSEECOM_CACHE_INVALIDATE);
if (ret) {
pr_err("cache operation failed %d\n", ret);
goto exit;
}
}
if (qseecom.qsee_reentrancy_support) {
ret = __qseecom_process_reentrancy(&resp, ptr_app, data);
@ -3802,6 +3786,15 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data,
}
}
}
if (data->client.dmabuf) {
ret = qseecom_dmabuf_cache_operations(data->client.dmabuf,
QSEECOM_CACHE_INVALIDATE);
if (ret) {
pr_err("cache operation failed %d\n", ret);
goto exit;
}
}
exit:
return ret;
}