Commit 61962b94 authored Apr 25, 2023 by Roland Mikhel Committed by Dávid Vincze Jun 27, 2023

bootutil: fix FIH int conversion for security_cnt



Currently there's a compile error when building MCUboot
with HW_ROLLBACK_PROT due to a comparison
when decoding the security_cnt fih_int value. In the security_cnt.h
it is stated that this value must be between 0 and UINT32_MAX
so this cast would not cause any undefined behaviour.

Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
Change-Id: Iee158a31955ff43b73e67a0c08e7a086077b9eb5

parent e6e4801c

boot/bootutil/src/image_validate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ bootutil_img_validate(struct enc_key_data *enc_state, int image_index,
		* stored security counter value.
		*/
		fih_rc = fih_ret_encode_zero_equality(img_security_cnt <
		fih_int_decode(security_cnt));
		(uint32_t)fih_int_decode(security_cnt));
		if (FIH_NOT_EQ(fih_rc, FIH_SUCCESS)) {
		FIH_SET(fih_rc, FIH_FAILURE);
		goto out;

Admin message