Skip to content

Commit da01e34

Browse files
author
Michael Schwarcz
committed
TF-M patch: Fix tfm_psa_call_venner wrong argument type (TF-M issue #241)
- Link to bug tracking: https://developer.trustedfirmware.org/T241
1 parent 011fa28 commit da01e34

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/core/tfm_psa_api_client.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ int32_t tfm_core_ns_ipc_request(void *fn, int32_t arg1, int32_t arg2,
4848
int32_t arg3, int32_t arg4)
4949
{
5050
int32_t args[4] = {arg1, arg2, arg3, arg4};
51-
struct tfm_sfn_req_s desc, *desc_ptr = &desc;
51+
volatile struct tfm_sfn_req_s desc;
52+
struct tfm_sfn_req_s *desc_ptr = &desc;
5253
int32_t res;
5354

5455
desc.sfn = fn;
@@ -98,7 +99,7 @@ psa_handle_t tfm_psa_connect_veneer(uint32_t sid, uint32_t minor_version)
9899
__tfm_secure_gateway_attributes__
99100
psa_status_t tfm_psa_call_veneer(psa_handle_t handle,
100101
const psa_invec *in_vecs,
101-
const psa_invec *out_vecs)
102+
psa_outvec *out_vecs)
102103
{
103104
TFM_CORE_NS_IPC_REQUEST_VENEER(tfm_svcall_psa_call, handle, in_vecs,
104105
out_vecs, 0);

components/TARGET_PSA/TARGET_TFM/interface/include/tfm_api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ psa_handle_t tfm_psa_connect_veneer(uint32_t sid, uint32_t minor_version);
105105
*
106106
* \param[in] handle Handle to connection
107107
* \param[in] in_vecs invec containing pointer/count of input vectors
108-
* \param[in] out_vecs invec containing pointer/count of output vectors
108+
* \param[in] out_vecs outvec containing pointer/count of output vectors
109109
*
110110
* \return Returns \ref psa_status_t status code
111111
*/
112112
psa_status_t tfm_psa_call_veneer(psa_handle_t handle,
113113
const psa_invec *in_vecs,
114-
const psa_invec *out_vecs);
114+
psa_outvec *out_vecs);
115115

116116
/**
117117
* \brief Close connection to secure function referenced by a connection handle

0 commit comments

Comments
 (0)