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

Merge pull request #9836 from kfnta/tfm_patch 

TF-M: Fix issues found in SPM tests
pull/9843/head
Cruz Monrreal 2019-02-25 19:58:38 -06:00 committed by GitHub
parent 044d0c9cb1 5f2cbaa18d
commit 15ccb32d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/core/ipc/tfm_svcalls.c
View File

@ -256,9 +256,6 @@ void tfm_svcall_psa_close(uint32_t *args, int32_t ns_caller)
* and scheduler triggered * and scheduler triggered
*/ */
tfm_spm_send_event(service, msg); tfm_spm_send_event(service, msg);
/* Service handle is not used anymore */
tfm_spm_free_conn_handle(service, handle);
} }
/*********************** SVC handler for PSA Service APIs ********************/ /*********************** SVC handler for PSA Service APIs ********************/
@ -788,6 +785,9 @@ static void tfm_svcall_psa_reply(uint32_t *args)
update_caller_outvec_len(msg); update_caller_outvec_len(msg);
break; break;
case PSA_IPC_DISCONNECT: case PSA_IPC_DISCONNECT:
/* Service handle is not used anymore */
tfm_spm_free_conn_handle(service, msg->handle);
/* /*
* If the message type is PSA_IPC_DISCONNECT, then the status code is * If the message type is PSA_IPC_DISCONNECT, then the status code is
* ignored * ignored

3
tools/importer/tfm_importer.json
View File

@ -96,7 +96,8 @@
"da01e3411fcf8010f4ae581946cf4b0e7753e024", "da01e3411fcf8010f4ae581946cf4b0e7753e024",
"008bf1b2d176c04fb33985e0677e90e3800cb4ca", "008bf1b2d176c04fb33985e0677e90e3800cb4ca",
"67a4e6d723dfb199fdbe9a2cef57dbe58cbc026f", "67a4e6d723dfb199fdbe9a2cef57dbe58cbc026f",
"6354b9a47351a29ea24023c5471b63d39e091959" "6354b9a47351a29ea24023c5471b63d39e091959",
"ebc961dab8630522fa341015260d9e75981f6982"
] ]
} }