commit 61962b94f331c0ab2a21c9983f528169a25dce45
author Roland Mikhel <roland.mikhel@arm.com> Tue Apr 25 14:03:08 2023 +0200
committer Dávid Vincze <david.vincze@arm.com> Tue Jun 27 14:42:34 2023 +0200
tree c4662769d2f234bfc215c414abb6448d8895e5a7
parent e6e4801ce2c74d0b31b49820b63e026400522a16

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

boot/bootutil/src/image_validate.c

diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
index 699017a..8260e59 100644
--- a/boot/bootutil/src/image_validate.c
+++ b/boot/bootutil/src/image_validate.c
@@ -494,7 +494,7 @@
              * 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;