Merge pull request wolfSSL#351 from jpbland1/bad-last-sector-address-fix

handle case where PART_UPDATE_ENDFLAGS % WOLFBOOT_SECTOR_SIZE == 0
philljj · Aug 22, 2023 · ee628f1 · ee628f1
2 parents 6bb05d5 + ed68b46
commit ee628f1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/libwolfboot.c b/src/libwolfboot.c
@@ -715,6 +715,13 @@ void RAMFUNCTION wolfBoot_update_trigger(void)
 #if defined(NVM_FLASH_WRITEONCE) || defined(WOLFBOOT_FLAGS_INVERT)
     uintptr_t lastSector = PART_UPDATE_ENDFLAGS -
         (PART_UPDATE_ENDFLAGS % WOLFBOOT_SECTOR_SIZE);
+
+#ifndef FLAGS_HOME
+    /* if PART_UPDATE_ENDFLAGS stradles a sector, (all non FLAGS_HOME builds)
+     * align it to the correct sector */
+    if (PART_UPDATE_ENDFLAGS % WOLFBOOT_SECTOR_SIZE == 0)
+        lastSector -= WOLFBOOT_SECTOR_SIZE;
+#endif
 #endif
 #ifdef NVM_FLASH_WRITEONCE
     uint8_t selSec = 0;