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

correctly identify a forward powerfail vs a revert 

powerfail and add an exception to wolfBoot_delta_update when a revert gets
interrupted since the version will change in the middle of the update process
pull/305/head
John Bland 2023-04-21 16:47:43 -04:00 committed by Daniele Lacamera
parent 14ec346e1c
commit b94249f8f7
3 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-powerfail-simulator.yml vendored
View File

@ -138,5 +138,5 @@ jobs:
# DELTA update currently fails when patch is large enough
- name: Run update-revert test with power failures (DELTA)
run: |
run: |
tools/scripts/sim-update-powerfail-resume.sh

37
src/update_flash.c
View File

@ -192,7 +192,8 @@ static int RAMFUNCTION wolfBoot_copy_sector(struct wolfBoot_image *src, struct w
#endif
static int wolfBoot_delta_update(struct wolfBoot_image *boot,
struct wolfBoot_image *update, struct wolfBoot_image *swap, int inverse)
struct wolfBoot_image *update, struct wolfBoot_image *swap, int inverse,
int resume_inverse)
{
int sector = 0;
int ret;
@ -210,6 +211,7 @@ static int wolfBoot_delta_update(struct wolfBoot_image *boot,
uint8_t nonce[ENCRYPT_NONCE_SIZE];
uint8_t enc_blk[DELTA_BLOCK_SIZE];
#endif
/* Use biggest size for the swap */
total_size = boot->fw_size + IMAGE_HEADER_SIZE;
if ((update->fw_size + IMAGE_HEADER_SIZE) > total_size)
@ -231,7 +233,7 @@ static int wolfBoot_delta_update(struct wolfBoot_image *boot,
cur_v = wolfBoot_current_firmware_version();
upd_v = wolfBoot_update_firmware_version();
delta_base_v = wolfBoot_get_diffbase_version(PART_UPDATE);
if ((cur_v == upd_v) && (delta_base_v < cur_v)) {
if (((cur_v == upd_v) && (delta_base_v < cur_v)) || resume_inverse) {
ret = wb_patch_init(&ctx, boot->hdr, boot->fw_size +
IMAGE_HEADER_SIZE, update->hdr + *img_offset, *img_size);
} else {
@ -372,7 +374,10 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
uint8_t nonce[ENCRYPT_NONCE_SIZE];
#endif
#ifdef DELTA_UPDATES
uint8_t interrupted = 0;
int inverse = 0;
int inverse_resume = 0;
uint32_t cur_v;
uint32_t up_v;
#endif
/* No Safety check on open: we might be in the middle of a broken update */
@ -380,7 +385,6 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
wolfBoot_open_image(&boot, PART_BOOT);
wolfBoot_open_image(&swap, PART_SWAP);
/* Use biggest size for the swap */
total_size = boot.fw_size + IMAGE_HEADER_SIZE;
if ((update.fw_size + IMAGE_HEADER_SIZE) > total_size)
@ -423,17 +427,26 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
#ifdef DELTA_UPDATES
if ((update_type & 0x00F0) == HDR_IMG_TYPE_DIFF) {
/* if the first sector flag is not new but we are updating then we */
/* were interrupted and need to resume instead of inverting */
cur_v = wolfBoot_current_firmware_version();
up_v = wolfBoot_update_firmware_version();
inverse = cur_v >= up_v;
/* if the first sector flag is not new but we are updating then */
/* we were interrupted */
if (flag != SECT_FLAG_NEW &&
(wolfBoot_get_partition_state(PART_UPDATE, &st) == 0) &&
(st == IMG_STATE_UPDATING)) {
interrupted = 1;
wolfBoot_get_partition_state(PART_UPDATE, &st) == 0 &&
st == IMG_STATE_UPDATING) {
if (cur_v == up_v) {
inverse = 0;
}
else if (cur_v < up_v) {
inverse = 1;
inverse_resume = 1;
}
}
return wolfBoot_delta_update(&boot, &update, &swap,
(wolfBoot_current_firmware_version() >=
wolfBoot_update_firmware_version() && !interrupted));
return wolfBoot_delta_update(&boot, &update, &swap, inverse,
inverse_resume);
}
#endif

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

@ -15,5 +15,15 @@ if [ "x$V" != "x2" ]; then
exit 1
fi
./wolfboot.elf powerfail 11000 get_version 2>/dev/null
./wolfboot.elf powerfail 14000 get_version 2>/dev/null
./wolfboot.elf powerfail 1e000 get_version 2>/dev/null
V=`./wolfboot.elf get_version 2>/dev/null`
if [ "x$V" != "x1" ]; then
echo "Failed fallback (V: $V)"
exit 1
fi
echo Test successful.
exit 0