yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix mutex unlock error handling in psa_destroy_key

Browse source 
Signed-off-by: Ryan Everett <ryan.everett@arm.com>
This commit is contained in:
Ryan Everett 2024-02-09 14:11:27 +00:00
parent a76a0011ab
commit 7fee4f7318
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/psa_crypto.c
View file

@ -1167,17 +1167,19 @@ exit:
/* Unregister from reading the slot. If we are the last active reader /* Unregister from reading the slot. If we are the last active reader
* then this will wipe the slot. */ * then this will wipe the slot. */
status = psa_unregister_read(slot); status = psa_unregister_read(slot);
/* Prioritize CORRUPTION_DETECTED from unregistering over
* a storage error. */
if (status != PSA_SUCCESS) {
overall_status = status;
}
#if defined(MBEDTLS_THREADING_C) #if defined(MBEDTLS_THREADING_C)
/* Don't overwrite existing errors if the unlock fails. */
status = overall_status;
PSA_THREADING_CHK_RET(mbedtls_mutex_unlock( PSA_THREADING_CHK_RET(mbedtls_mutex_unlock(
&mbedtls_threading_key_slot_mutex)); &mbedtls_threading_key_slot_mutex));
#endif #endif
/* Prioritize CORRUPTION_DETECTED from unregistering or
* SERVICE_FAILURE from unlocking over a storage error. */
if (status != PSA_SUCCESS) {
overall_status = status;
}
return overall_status; return overall_status;
} }