Major bug fixes in new update code

Author: danielinux

hal/nrf52.c

@@ -68,12 +68,12 @@ int hal_flash_write(uint32_t address, const uint8_t *data, int len)
         *((uint32_t *)(address - off)) = first;
         flash_wait_complete();
         address += 4 - off;
-        data += off;
+        data += 4 - off;
+        len -= 4 - off;
     }
     if (len > 3) {
         uint32_t *src = (uint32_t *)data;
         uint32_t *dst = (uint32_t *)address;
-        len -= off;
         words = len / 4;
         align = words * 4;
         for (i = 0; i < words; i ++) {

src/libwolfboot.c

@@ -63,7 +63,7 @@ int wolfBoot_set_sector_flag(uint8_t part, uint8_t sector, uint8_t newflag)
     magic = (uint32_t *)(trailer_end - sizeof(uint32_t));
     if (*magic != WOLFBOOT_MAGIC_TRAIL)
         hal_flash_write((uint32_t)magic, (void *)&wolfboot_magic_trail, sizeof(uint32_t));
-    flags = (trailer_end - sizeof(uint32_t)) - pos;
+    flags = (trailer_end - sizeof(uint32_t)) - (2 + pos);
     if (sector == (pos << 1))
         fl_value = (*flags & 0xF0) | (newflag & 0x0F);
     else
@@ -78,7 +78,7 @@ int wolfBoot_get_partition_state(uint8_t part, uint8_t *st)
     uint8_t *trailer_end = get_trailer(part);
     uint32_t *magic;
     uint8_t *state;
-    if (trailer_end)
+    if (!trailer_end)
         return -1;
     magic = (uint32_t *)(trailer_end - sizeof(uint32_t));
     if (*magic != WOLFBOOT_MAGIC_TRAIL)
@@ -99,7 +99,7 @@ int wolfBoot_get_sector_flag(uint8_t part, uint8_t sector, uint8_t *flag)
     magic = (uint32_t *)(trailer_end - sizeof(uint32_t));
     if (*magic != WOLFBOOT_MAGIC_TRAIL)
         return -1;
-    flags = (trailer_end - sizeof(uint32_t)) - pos;
+    flags = (trailer_end - sizeof(uint32_t)) - (2 + pos);
     if (sector == (pos << 1))
         *flag = *flags & 0x0F;
     else

src/loader.c

@@ -32,8 +32,8 @@ static int wolfBoot_update(void)
     uint32_t sector = 0;
     uint8_t flag, st;
     struct wolfBoot_image update;
-    
-    if ((wolfBoot_open_image(&update, PART_BOOT) < 0) ||
+
+    if ((wolfBoot_open_image(&update, PART_UPDATE) < 0) ||
             (wolfBoot_verify_integrity(&update) < 0)  ||
             (wolfBoot_verify_authenticity(&update) < 0)) {
         return -1;
@@ -50,7 +50,7 @@ static int wolfBoot_update(void)
                    WOLFBOOT_PARTITION_SWAP_ADDRESS,
                    WOLFBOOT_SECTOR_SIZE);
            wolfBoot_set_sector_flag(PART_UPDATE, sector, flag);
-        } 
+        }
         if (flag == SECT_FLAG_SWAPPING) {
             uint32_t size = total_size - (sector * sector_size);
             if (size > sector_size)
@@ -95,6 +95,12 @@ static void wolfBoot_start(void)
 {
     uint8_t st;
     struct wolfBoot_image boot;
+    if ((wolfBoot_get_partition_state(PART_UPDATE, &st) == 0) && (st == IMG_STATE_UPDATING)) {
+        wolfBoot_update();
+    } else if ((wolfBoot_get_partition_state(PART_BOOT, &st) == 0) && (st == IMG_STATE_TESTING)) {
+        wolfBoot_update_trigger();
+        wolfBoot_update();
+    }
     if ((wolfBoot_open_image(&boot, PART_BOOT) < 0) ||
             (wolfBoot_verify_integrity(&boot) < 0)  ||
             (wolfBoot_verify_authenticity(&boot) < 0)) {
@@ -103,12 +109,6 @@ static void wolfBoot_start(void)
                 /* panic */;
         }
     }
-    if ((wolfBoot_get_partition_state(PART_UPDATE, &st) == 0) && (st == IMG_STATE_UPDATING)) {
-        wolfBoot_update();
-    } else if ((wolfBoot_get_partition_state(PART_BOOT, &st) == 0) && (st == IMG_STATE_TESTING)) {
-        wolfBoot_update_trigger();
-        wolfBoot_update();
-    }
     do_boot((void *)boot.fw_base);
 }