fix(psa): align with original API in tf-m-extras
The measured boot API is available in the tf-m-extras
repo:
partitions/measured_boot/interface/src/measured_boot_api.c
This change make the API behavior align with
the original implementation.
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: Ie4af38b859f942b2ef090e92da64d75811b5b49b
diff --git a/lib/psa/measured_boot.c b/lib/psa/measured_boot.c
index 90e4ef3..3c54f47 100644
--- a/lib/psa/measured_boot.c
+++ b/lib/psa/measured_boot.c
@@ -87,12 +87,11 @@
{.base = measurement_value, .len = measurement_value_size}
};
- uint32_t sw_type_size_limited;
-
if (sw_type != NULL) {
- sw_type_size_limited = (sw_type_size < SW_TYPE_MAX_SIZE) ?
- sw_type_size : SW_TYPE_MAX_SIZE;
- memcpy(extend_iov.sw_type, sw_type, sw_type_size_limited);
+ if (sw_type_size > SW_TYPE_MAX_SIZE) {
+ return PSA_ERROR_INVALID_ARGUMENT;
+ }
+ memcpy(extend_iov.sw_type, sw_type, sw_type_size);
}
log_measurement(index, signer_id, signer_id_size,