Fix WOLFBOOT_MAX_SPACE precedence and test

F/2587

Author: danielinux

include/image.h

@@ -1395,7 +1395,7 @@ static inline int wb_flash_write_verify_word(struct wolfBoot_image *img,
 #ifndef EXT_ENCRYPTED
 #define WOLFBOOT_MAX_SPACE (WOLFBOOT_PARTITION_SIZE - \
     (TRAILER_SKIP + sizeof(uint32_t) + \
-    (WOLFBOOT_PARTITION_SIZE + 1 / (WOLFBOOT_SECTOR_SIZE * 8))))
+    ((WOLFBOOT_PARTITION_SIZE + 1) / (WOLFBOOT_SECTOR_SIZE * 8))))
 #else
 #define WOLFBOOT_MAX_SPACE (WOLFBOOT_PARTITION_SIZE - ENCRYPT_TMP_SECRET_OFFSET)
 #endif

tools/unit-tests/Makefile

@@ -45,6 +45,7 @@ endif
 
 TESTS:=unit-parser unit-fdt unit-extflash unit-string unit-spi-flash unit-aes128 \
        unit-aes256 unit-chacha20 unit-pci unit-mock-state unit-sectorflags \
+       unit-max-space \
        unit-image unit-image-rsa unit-nvm unit-nvm-flagshome unit-enc-nvm \
        unit-enc-nvm-flagshome unit-delta unit-update-flash unit-update-flash-delta \
        unit-update-flash-self-update \
@@ -205,6 +206,9 @@ unit-store-sbrk: unit-store-sbrk.c ../../src/store_sbrk.c
 unit-string: ../../include/target.h unit-string.c
 	gcc -o $@ $^ $(CFLAGS) -DDEBUG_UART -DPRINTF_ENABLED $(LDFLAGS)
 
+unit-max-space: ../../include/target.h unit-max-space.c
+	gcc -o $@ $^ $(CFLAGS) $(LDFLAGS)
+
 unit-update-flash-self-update: ../../include/target.h unit-update-flash.c
 	gcc -o $@ unit-update-flash.c ../../src/image.c \
 	$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha256.c \

tools/unit-tests/unit-max-space.c

@@ -0,0 +1,49 @@
+/* unit-max-space.c
+ *
+ * Unit test for WOLFBOOT_MAX_SPACE macro arithmetic in image.h
+ */
+
+#include <check.h>
+#include <stdint.h>
+
+#define TRAILER_SKIP 0
+#include "image.h"
+
+START_TEST(test_wolfboot_max_space_formula)
+{
+    uint32_t expected = (uint32_t)(WOLFBOOT_PARTITION_SIZE -
+        (TRAILER_SKIP + sizeof(uint32_t) +
+        ((WOLFBOOT_PARTITION_SIZE + 1U) / (WOLFBOOT_SECTOR_SIZE * 8U))));
+    uint32_t actual = (uint32_t)WOLFBOOT_MAX_SPACE;
+
+    ck_assert_uint_eq(actual, expected);
+}
+END_TEST
+
+Suite *wolfboot_suite(void)
+{
+    Suite *s;
+    TCase *tc_core;
+
+    s = suite_create("WOLFBOOT_MAX_SPACE");
+    tc_core = tcase_create("Core");
+    tcase_add_test(tc_core, test_wolfboot_max_space_formula);
+    suite_add_tcase(s, tc_core);
+
+    return s;
+}
+
+int main(void)
+{
+    int number_failed;
+    Suite *s;
+    SRunner *sr;
+
+    s = wolfboot_suite();
+    sr = srunner_create(s);
+    srunner_run_all(sr, CK_NORMAL);
+    number_failed = srunner_ntests_failed(sr);
+    srunner_free(sr);
+
+    return (number_failed == 0) ? 0 : 1;
+}