arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-01 19:38:33 +00:00
Code Issues Releases Wiki Activity

norcow: fix bug

Browse Source
This commit is contained in:
Pavol Rusnak 2017-12-08 16:15:19 +01:00
parent 7f5192701f
commit b39b4a4947
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
embed/extmod/modtrezorconfig/norcow.c
View File

@ -72,7 +72,7 @@ static void norcow_erase(uint8_t sector, secbool set_magic)
ensure(sectrue * (sector <= NORCOW_SECTOR_COUNT), "invalid sector"); ensure(sectrue * (sector <= NORCOW_SECTOR_COUNT), "invalid sector");
ensure(flash_erase_sectors(&norcow_sectors[sector], 1, NULL), "erase failed"); ensure(flash_erase_sectors(&norcow_sectors[sector], 1, NULL), "erase failed");
if (sectrue == set_magic) { if (sectrue == set_magic) {
ensure(norcow_write(norcow_active_sector, 0, NORCOW_MAGIC, NULL, 0), "set magic failed"); ensure(norcow_write(sector, 0, NORCOW_MAGIC, NULL, 0), "set magic failed");
} }
} }
@ -206,13 +206,15 @@ static void compact()
// copy the last item // copy the last item
uint32_t posw; uint32_t posw;
r = write_item(norcow_next_sector, offsetw, k, v, l, &posw); r = write_item(norcow_next_sector, offsetw, k, v, l, &posw);
if (sectrue != r) { } // TODO: error if (sectrue != r) {
// TODO: error
}
offsetw = posw; offsetw = posw;
} }
norcow_erase(norcow_active_sector, secfalse); norcow_erase(norcow_active_sector, secfalse);
norcow_active_sector = norcow_next_sector; norcow_active_sector = norcow_next_sector;
norcow_active_offset = find_free_offset(norcow_active_sector); norcow_active_offset = offsetw;
} }
/* /*
@ -231,16 +233,13 @@ secbool norcow_init(void)
} }
} }
// no active sectors found - let's erase // no active sectors found - let's erase
if (sectrue != found) { if (sectrue == found) {
norcow_active_sector = 0; norcow_active_offset = find_free_offset(norcow_active_sector);
} else {
if (sectrue != norcow_wipe()) { if (sectrue != norcow_wipe()) {
return secfalse; return secfalse;
} }
if (sectrue != norcow_write(norcow_active_sector, 0, NORCOW_MAGIC, NULL, 0)) {
return secfalse;
} }
}
norcow_active_offset = find_free_offset(norcow_active_sector);
return sectrue; return sectrue;
} }