ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TF-M patch: Fix tfm_psa_call_venner wrong argument type (TF-M issue #241) 

- Link to bug tracking: https://developer.trustedfirmware.org/T241
pull/9653/head
Michael Schwarcz 2019-02-07 12:14:41 +02:00
parent 011fa28110
commit da01e3411f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/core/tfm_psa_api_client.c
View File

@ -48,7 +48,8 @@ int32_t tfm_core_ns_ipc_request(void *fn, int32_t arg1, int32_t arg2,
int32_t arg3, int32_t arg4) int32_t arg3, int32_t arg4)
{ {
int32_t args[4] = {arg1, arg2, arg3, arg4}; int32_t args[4] = {arg1, arg2, arg3, arg4};
struct tfm_sfn_req_s desc, *desc_ptr = &desc; volatile struct tfm_sfn_req_s desc;
struct tfm_sfn_req_s *desc_ptr = &desc;
int32_t res; int32_t res;
desc.sfn = fn; desc.sfn = fn;
@ -98,7 +99,7 @@ psa_handle_t tfm_psa_connect_veneer(uint32_t sid, uint32_t minor_version)
__tfm_secure_gateway_attributes__ __tfm_secure_gateway_attributes__
psa_status_t tfm_psa_call_veneer(psa_handle_t handle, psa_status_t tfm_psa_call_veneer(psa_handle_t handle,
const psa_invec *in_vecs, const psa_invec *in_vecs,
const psa_invec *out_vecs) psa_outvec *out_vecs)
{ {
TFM_CORE_NS_IPC_REQUEST_VENEER(tfm_svcall_psa_call, handle, in_vecs, TFM_CORE_NS_IPC_REQUEST_VENEER(tfm_svcall_psa_call, handle, in_vecs,
out_vecs, 0); out_vecs, 0);

4
components/TARGET_PSA/TARGET_TFM/interface/include/tfm_api.h
View File

@ -105,13 +105,13 @@ psa_handle_t tfm_psa_connect_veneer(uint32_t sid, uint32_t minor_version);
* *
* \param[in] handle Handle to connection * \param[in] handle Handle to connection
* \param[in] in_vecs invec containing pointer/count of input vectors * \param[in] in_vecs invec containing pointer/count of input vectors
* \param[in] out_vecs invec containing pointer/count of output vectors * \param[in] out_vecs outvec containing pointer/count of output vectors
* *
* \return Returns \ref psa_status_t status code * \return Returns \ref psa_status_t status code
*/ */
psa_status_t tfm_psa_call_veneer(psa_handle_t handle, psa_status_t tfm_psa_call_veneer(psa_handle_t handle,
const psa_invec *in_vecs, const psa_invec *in_vecs,
const psa_invec *out_vecs); psa_outvec *out_vecs);
/** /**
* \brief Close connection to secure function referenced by a connection handle * \brief Close connection to secure function referenced by a connection handle