openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

flashrom: Check for flash access restrictions in erase path

Browse Source 
Skip unwritable regions if FLASHROM_FLAG_SKIP_UNWRITABLE_REGIONS is
true. If the flag is false, erase operations that include an unwritable
region will not erase anything and return an error.

BUG=b:260440773
BRANCH=none
TEST=flashrom -E on dedede (JSL)

Change-Id: If027a96a024782c7707c6d38680709a1a117f3ef
CoAuthored-by: Edward O'Callaghan <quasisec@google.com>
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/70517
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Nikolai Artemiev 2022-12-09 15:31:01 +11:00 committed by Edward O'Callaghan
parent dc7485b361
commit 9a152b8191
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
flashrom.c
View File

@ -1460,13 +1460,39 @@ static int erase_block(struct flashctx *const flashctx,
all_skipped = false;
msg_cdbg("E");
if (erasefn(flashctx, info->erase_start, erase_len))
goto _free_ret;
if (check_erased_range(flashctx, info->erase_start, erase_len)) {
msg_cerr("ERASE FAILED!\n");
goto _free_ret;
if (!flashctx->flags.skip_unwritable_regions) {
if (check_for_unwritable_regions(flashctx, info->erase_start, erase_len))
goto _free_ret;
}
unsigned int len;
for (unsigned int addr = info->erase_start; addr < info->erase_start + erase_len; addr += len) {
struct flash_region region;
get_flash_region(flashctx, addr, &region);
len = min(info->erase_start + erase_len, region.end) - addr;
if (region.write_prot) {
msg_gdbg("%s: cannot erase inside %s region (%#08x..%#08x), skipping range (%#08x..%#08x).\n",
__func__, region.name, region.start, region.end - 1, addr, addr + len - 1);
free(region.name);
continue;
}
msg_gdbg("%s: %s region (%#08x..%#08x) is writable, erasing range (%#08x..%#08x).\n",
__func__, region.name, region.start, region.end - 1, addr, addr + len - 1);
free(region.name);
if (erasefn(flashctx, addr, len))
goto _free_ret;
if (check_erased_range(flashctx, addr, len)) {
msg_cerr("ERASE FAILED!\n");
goto _free_ret;
}
}
if (region_unaligned) {
unsigned int starthere = 0, lenhere = 0, writecount = 0;
/* get_next_write() sets starthere to a new value after the call. */