openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

writeprotect.c: refuse to work with chip if OTP WPS == 1

Browse Source 
Perform the check right in read_wp_bits() as it's used by various WP
operations and also because its results won't make sense if WPS bit is
on and can't be changed.

Change-Id: I143186066a1d3af89809b7135886cb8b0d038085
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66836
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
This commit is contained in:
Sergii Dmytruk 2022-08-17 18:29:10 +03:00 committed by Anastasia Klimchuk
parent 6d475ec4ab
commit 0f4767fd1e
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli_classic.c
View File

@ -202,6 +202,8 @@ static const char *get_wp_error_str(int err)
return "the requested protection range is not supported";
case FLASHROM_WP_ERR_RANGE_LIST_UNAVAILABLE:
return "could not determine what protection ranges are available";
case FLASHROM_WP_ERR_UNSUPPORTED_STATE:
return "can't operate on current WP configuration of the chip";
}
return "unknown WP error";
}

3
include/libflashrom.h
View File

@ -464,7 +464,8 @@ enum flashrom_wp_result {
FLASHROM_WP_ERR_VERIFY_FAILED = 5,
FLASHROM_WP_ERR_RANGE_UNSUPPORTED = 6,
FLASHROM_WP_ERR_MODE_UNSUPPORTED = 7,
FLASHROM_WP_ERR_RANGE_LIST_UNAVAILABLE = 8
FLASHROM_WP_ERR_RANGE_LIST_UNAVAILABLE = 8,
FLASHROM_WP_ERR_UNSUPPORTED_STATE = 9
};
enum flashrom_wp_mode {

21
writeprotect.c
View File

@ -73,6 +73,25 @@ static enum flashrom_wp_result read_wp_bits(struct wp_bits *bits, struct flashct
size_t i;
enum flashrom_wp_result ret;
/*
* Write protection select bit (WPS) controls kind of write protection
* that is used by the chip. When set, BP bits are ignored and each
* block/sector has its own WP bit managed by special commands. When
* the bit is set and we can't change it, just bail out until
* implementation is extended to handle this kind of WP.
*/
if (bit_map->wps.reg != INVALID_REG && bit_map->wps.writability != RW) {
bool wps_bit_present;
uint8_t wps;
ret = read_bit(&wps, &wps_bit_present, flash, bit_map->wps);
if (ret != FLASHROM_WP_OK)
return ret;
if (wps_bit_present && wps)
return FLASHROM_WP_ERR_UNSUPPORTED_STATE;
}
ret = read_bit(&bits->tb, &bits->tb_bit_present, flash, bit_map->tb);
if (ret != FLASHROM_WP_OK)
return ret;
@ -93,8 +112,6 @@ static enum flashrom_wp_result read_wp_bits(struct wp_bits *bits, struct flashct
if (ret != FLASHROM_WP_OK)
return ret;
/* Note: WPS bit isn't read here, because it's not part of any range. */
for (i = 0; i < ARRAY_SIZE(bits->bp); i++) {
if (bit_map->bp[i].reg == INVALID_REG)
break;