Skip to content

TF-M: Fix issues found in SPM tests #9836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2019
Merged

TF-M: Fix issues found in SPM tests #9836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebc961d
TF-M patch: Free connection handle in psa_reply (TF-M issue #263)
Feb 22, 2019
5f2cbaa
TFM Importer: Update SHAa of TFM patches
Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/secure_fw/core/ipc/tfm_svcalls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,6 @@ void tfm_svcall_psa_close(uint32_t *args, int32_t ns_caller)
* and scheduler triggered
*/
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 ********************/
Expand Down Expand Up @@ -788,6 +785,9 @@ static void tfm_svcall_psa_reply(uint32_t *args)
update_caller_outvec_len(msg);
break;
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
* ignored
Expand Down
3 changes: 2 additions & 1 deletion tools/importer/tfm_importer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@
"da01e3411fcf8010f4ae581946cf4b0e7753e024",
"008bf1b2d176c04fb33985e0677e90e3800cb4ca",
"67a4e6d723dfb199fdbe9a2cef57dbe58cbc026f",
"6354b9a47351a29ea24023c5471b63d39e091959"
"6354b9a47351a29ea24023c5471b63d39e091959",
"ebc961dab8630522fa341015260d9e75981f6982"
]
}