WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #342 from jpbland1/first-sector-fail 

First sector fail fix
pull/343/head
David Garske 2023-08-15 12:41:26 -07:00 committed by GitHub
parent 5bc1f09378 c26f1e6a9c
commit 40bbd74376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/update_flash.c
View File

@ -361,6 +361,19 @@ out:
#define MAX_UPDATE_SIZE (size_t)((WOLFBOOT_PARTITION_SIZE - (2 *WOLFBOOT_SECTOR_SIZE))) #define MAX_UPDATE_SIZE (size_t)((WOLFBOOT_PARTITION_SIZE - (2 *WOLFBOOT_SECTOR_SIZE)))
#endif #endif
static inline int wolfBoot_get_total_size(struct wolfBoot_image* boot,
struct wolfBoot_image* update)
{
uint32_t total_size = 0;
/* Use biggest size for the swap */
total_size = boot->fw_size + IMAGE_HEADER_SIZE;
if ((update->fw_size + IMAGE_HEADER_SIZE) > total_size)
total_size = update->fw_size + IMAGE_HEADER_SIZE;
return total_size;
}
static int RAMFUNCTION wolfBoot_update(int fallback_allowed) static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
{ {
uint32_t total_size = 0; uint32_t total_size = 0;
@ -369,6 +382,7 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
uint8_t flag, st; uint8_t flag, st;
struct wolfBoot_image boot, update, swap; struct wolfBoot_image boot, update, swap;
uint16_t update_type; uint16_t update_type;
uint32_t fw_size;
#ifdef EXT_ENCRYPTED #ifdef EXT_ENCRYPTED
uint8_t key[ENCRYPT_KEY_SIZE]; uint8_t key[ENCRYPT_KEY_SIZE];
uint8_t nonce[ENCRYPT_NONCE_SIZE]; uint8_t nonce[ENCRYPT_NONCE_SIZE];
@ -385,10 +399,8 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
wolfBoot_open_image(&boot, PART_BOOT); wolfBoot_open_image(&boot, PART_BOOT);
wolfBoot_open_image(&swap, PART_SWAP); wolfBoot_open_image(&swap, PART_SWAP);
/* Use biggest size for the swap */ /* get total size */
total_size = boot.fw_size + IMAGE_HEADER_SIZE; total_size = wolfBoot_get_total_size(&boot, &update);
if ((update.fw_size + IMAGE_HEADER_SIZE) > total_size)
total_size = update.fw_size + IMAGE_HEADER_SIZE;
if (total_size <= IMAGE_HEADER_SIZE) if (total_size <= IMAGE_HEADER_SIZE)
return -1; return -1;
@ -492,6 +504,25 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
wolfBoot_set_update_sector_flag(sector, flag); wolfBoot_set_update_sector_flag(sector, flag);
} }
sector++; sector++;
/* headers that can be in different positions depending on when the
* power fails are now in a known state, re-read and swap fw_size
* because the locations are correct but the metadata is now swapped
* also recalculate total_size since it could be invalid */
if (sector == 1) {
wolfBoot_open_image(&boot, PART_BOOT);
wolfBoot_open_image(&update, PART_UPDATE);
/* swap the fw_size since they're now swapped */
fw_size = boot.fw_size;
boot.fw_size = update.fw_size;
update.fw_size = fw_size;
/* get total size */
total_size = wolfBoot_get_total_size(&boot, &update);
if (total_size <= IMAGE_HEADER_SIZE)
return -1;
}
} }
while((sector * sector_size) < WOLFBOOT_PARTITION_SIZE) { while((sector * sector_size) < WOLFBOOT_PARTITION_SIZE) {
wb_flash_erase(&boot, sector * sector_size, sector_size); wb_flash_erase(&boot, sector * sector_size, sector_size);

2
tools/scripts/sim-update-powerfail-resume.sh
View File

@ -5,6 +5,7 @@ if [ "x$V" != "x1" ]; then
exit 1 exit 1
fi fi
./wolfboot.elf powerfail 0 get_version 2>/dev/null
./wolfboot.elf powerfail 15000 get_version 2>/dev/null ./wolfboot.elf powerfail 15000 get_version 2>/dev/null
./wolfboot.elf powerfail 18000 get_version 2>/dev/null ./wolfboot.elf powerfail 18000 get_version 2>/dev/null
./wolfboot.elf powerfail 1a000 get_version 2>/dev/null ./wolfboot.elf powerfail 1a000 get_version 2>/dev/null
@ -15,6 +16,7 @@ if [ "x$V" != "x2" ]; then
exit 1 exit 1
fi fi
./wolfboot.elf powerfail 1000 get_version 2>/dev/null
./wolfboot.elf powerfail 11000 get_version 2>/dev/null ./wolfboot.elf powerfail 11000 get_version 2>/dev/null
./wolfboot.elf powerfail 14000 get_version 2>/dev/null ./wolfboot.elf powerfail 14000 get_version 2>/dev/null
./wolfboot.elf powerfail 1e000 get_version 2>/dev/null ./wolfboot.elf powerfail 1e000 get_version 2>/dev/null

26
tools/test.mk
View File

@ -920,29 +920,29 @@ test-all: clean
test-size-all: test-size-all:
make test-size SIGN=NONE LIMIT=4683 make test-size SIGN=NONE LIMIT=4722
make keysclean make keysclean
make test-size SIGN=ED25519 LIMIT=11350 make test-size SIGN=ED25519 LIMIT=11398
make keysclean make keysclean
make test-size SIGN=ECC256 LIMIT=22212 make test-size SIGN=ECC256 LIMIT=22174
make keysclean make keysclean
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13646 make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13610
make keysclean make keysclean
make test-size SIGN=RSA2048 LIMIT=11144 make test-size SIGN=RSA2048 LIMIT=11182
make keysclean make keysclean
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11112 make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11162
make keysclean make keysclean
make test-size SIGN=RSA4096 LIMIT=11502 make test-size SIGN=RSA4096 LIMIT=11546
make keysclean make keysclean
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=11422 make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=11462
make keysclean make keysclean
make test-size SIGN=ECC384 LIMIT=17550 make test-size SIGN=ECC384 LIMIT=17470
make keysclean make keysclean
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15082 make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15042
make keysclean make keysclean
make test-size SIGN=ED448 LIMIT=13394 make test-size SIGN=ED448 LIMIT=13414
make keysclean make keysclean
make test-size SIGN=RSA3072 LIMIT=11342 make test-size SIGN=RSA3072 LIMIT=11382
make keysclean make keysclean
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11216 make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11254
make keysclean make keysclean