Skip to content

wolfBoot_update_trigger: Fix double-write-after-erase in NVM...WRITEONCE #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgarske merged 3 commits into from
Jun 30, 2025
+19 −9
Merged

wolfBoot_update_trigger: Fix double-write-after-erase in NVM...WRITEONCE #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81a63ee
Attempt to fix double write in update_trigger
danielinux Jun 30, 2025
d14045a
Account for flags offset when FLAGS_HOME is defined
danielinux Jun 30, 2025
9e8ed90
Update unit tests: inverted selection
danielinux Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/libwolfboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,17 +752,27 @@ void RAMFUNCTION wolfBoot_update_trigger(void)
* FLAGS_INVERT needs erased flags because the bin-assemble's fill byte may
* not match what's in wolfBoot */
if (FLAGS_UPDATE_EXT()) {
ext_flash_erase(lastSector, SECTOR_FLAGS_SIZE);
ext_flash_erase(lastSector, WOLFBOOT_SECTOR_SIZE);
wolfBoot_set_partition_state(PART_UPDATE, st);
} else {
#ifndef NVM_FLASH_WRITEONCE
hal_flash_erase(lastSector, SECTOR_FLAGS_SIZE);
hal_flash_erase(lastSector, WOLFBOOT_SECTOR_SIZE);
wolfBoot_set_partition_state(PART_UPDATE, st);
#else
uint32_t magic = WOLFBOOT_MAGIC_TRAIL;
uint32_t offset = SECTOR_FLAGS_SIZE;
#ifdef FLAGS_HOME
offset -= (PART_BOOT_ENDFLAGS - PART_UPDATE_ENDFLAGS);
#endif
selSec = nvm_select_fresh_sector(PART_UPDATE);
XMEMCPY(NVM_CACHE, (uint8_t*)lastSector - WOLFBOOT_SECTOR_SIZE * selSec,
WOLFBOOT_SECTOR_SIZE);
/* write to the non selected sector */
hal_flash_erase(lastSector - WOLFBOOT_SECTOR_SIZE * !selSec,
WOLFBOOT_SECTOR_SIZE);

NVM_CACHE[offset] = IMG_STATE_UPDATING;
memcpy(NVM_CACHE + offset + 1, &magic, sizeof(uint32_t));
hal_flash_write(lastSector - WOLFBOOT_SECTOR_SIZE * !selSec, NVM_CACHE,
WOLFBOOT_SECTOR_SIZE);
/* erase the previously selected sector */
Expand All @@ -771,7 +781,6 @@ void RAMFUNCTION wolfBoot_update_trigger(void)
#endif
}

wolfBoot_set_partition_state(PART_UPDATE, st);

if (FLAGS_UPDATE_EXT()) {
ext_flash_lock();
Expand Down
7 changes: 4 additions & 3 deletions tools/unit-tests/unit-enc-nvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#define MOCK_ADDRESS_SWAP 0xCE000000
const char ENCRYPT_KEY[] = "0123456789abcdef0123456789abcdef0123456789abcdef";
#include <stdio.h>
#include "image.h"
#include "encrypt.h"
#include "libwolfboot.c"
#include <fcntl.h>
Expand Down Expand Up @@ -274,10 +275,10 @@ START_TEST (test_nvm_update_with_encryption)
/* Triggering update to set flags */
wolfBoot_update_trigger();

/* Current selected should now be 0 */
/* Current selected should now be 1 */
ret = nvm_select_fresh_sector(PART_UPDATE);
ck_assert_msg(ret == 0, "Failed to select updating fresh sector\n");
ck_assert_msg(erased_nvm_bank1 != 0, "Did not erase the non-selected bank");
ck_assert_msg(ret == 1, "Failed to select updating fresh sector\n");
ck_assert_msg(erased_nvm_bank0 != 0, "Did not erase the non-selected bank");

magic = get_partition_magic(PART_UPDATE);
ck_assert_msg(*magic == *boot_word,
Expand Down
6 changes: 3 additions & 3 deletions tools/unit-tests/unit-nvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@ START_TEST (test_nvm_select_fresh_sector)
/* Triggering update to set flags */
wolfBoot_update_trigger();

/* Current selected should now be 0 */
/* Current selected should now be 1 */
ret = nvm_select_fresh_sector(PART_UPDATE);
ck_assert_msg(ret == 0, "Failed to select updating fresh sector\n");
ck_assert_msg(erased_nvm_bank1 > 0, "Did not erase the non-selected bank");
ck_assert_msg(ret == 1, "Failed to select updating fresh sector\n");
ck_assert_msg(erased_nvm_bank0 > 0, "Did not erase the non-selected bank");

magic = get_partition_magic(PART_UPDATE);
ck_assert_msg(*magic == *boot_word,
Expand Down