Propagate hal_flash_write() error when writing partition magic

F/437

Author: danielinux

src/libwolfboot.c

@@ -374,6 +374,8 @@ static int RAMFUNCTION partition_magic_write(uint8_t part, uintptr_t addr)
     XMEMCPY(NVM_CACHE, (void*)addr_read, NVM_CACHE_SIZE);
     XMEMCPY(NVM_CACHE + off, &wolfboot_magic_trail, sizeof(uint32_t));
     ret = hal_flash_write(addr_write, NVM_CACHE, WOLFBOOT_SECTOR_SIZE);
+    if (ret != 0)
+        return ret;
     nvm_cached_sector = !nvm_cached_sector;
     ret = hal_flash_erase(addr_read, WOLFBOOT_SECTOR_SIZE);
     return ret;

tools/unit-tests/unit-mock-flash.c

@@ -31,6 +31,7 @@ static int erased_swap = 0;
 static int erased_nvm_bank0 = 0;
 static int erased_nvm_bank1 = 0;
 static int erased_vault = 0;
+static int hal_flash_write_fail = 0;
 const char *argv0;
 
 #include <sys/stat.h>
@@ -45,6 +46,10 @@ int hal_flash_write(haladdr_t address, const uint8_t *data, int len)
     int i;
     uint8_t *a = (uint8_t *)(uintptr_t)address;
     ck_assert_msg(!locked, "Attempting to write to a locked FLASH");
+    if (hal_flash_write_fail) {
+        hal_flash_write_fail = 0;
+        return -1;
+    }
     if ((address >= WOLFBOOT_PARTITION_SWAP_ADDRESS) &&
             (address < WOLFBOOT_PARTITION_UPDATE_ADDRESS + WOLFBOOT_SECTOR_SIZE)) {
         for (i = 0; i < len; i++) {

tools/unit-tests/unit-nvm.c

@@ -285,6 +285,41 @@ START_TEST (test_nvm_select_fresh_sector)
 }
 END_TEST
 
+START_TEST(test_partition_magic_write_stops_on_flash_write_error)
+{
+    int ret;
+    uint32_t *magic;
+
+    ret = mmap_file("/tmp/wolfboot-unit-file-error.bin", (void *)MOCK_ADDRESS,
+            WOLFBOOT_PARTITION_SIZE, NULL);
+    ck_assert(ret >= 0);
+    ret = mmap_file("/tmp/wolfboot-unit-swap-error.bin", (void *)MOCK_ADDRESS_SWAP,
+            WOLFBOOT_SECTOR_SIZE, NULL);
+    ck_assert(ret >= 0);
+
+    hal_flash_unlock();
+    wolfBoot_erase_partition(PART_UPDATE);
+
+    magic = get_partition_magic(PART_UPDATE);
+    *magic = wolfboot_magic_trail;
+
+    erased_update = 0;
+    erased_nvm_bank0 = 0;
+    erased_nvm_bank1 = 0;
+    hal_flash_write_fail = 1;
+
+    ret = partition_magic_write(PART_UPDATE,
+            PART_UPDATE_ENDFLAGS - sizeof(uint32_t));
+    ck_assert_int_eq(ret, -1);
+    ck_assert_int_eq(erased_update, 0);
+    ck_assert_int_eq(erased_nvm_bank0, 0);
+    ck_assert_int_eq(erased_nvm_bank1, 0);
+    ck_assert_uint_eq(*magic, wolfboot_magic_trail);
+
+    hal_flash_lock();
+}
+END_TEST
+
 
 Suite *wolfboot_suite(void)
 {
@@ -294,6 +329,8 @@ Suite *wolfboot_suite(void)
     /* Test cases */
     TCase *nvm_select_fresh_sector = tcase_create("NVM select fresh sector");
     tcase_add_test(nvm_select_fresh_sector, test_nvm_select_fresh_sector);
+    tcase_add_test(nvm_select_fresh_sector,
+            test_partition_magic_write_stops_on_flash_write_error);
     suite_add_tcase(s, nvm_select_fresh_sector);
 
     return s;