From b166142439f81abaf08a8a62a1d3c04e5f7ab78e Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Wed, 10 Apr 2019 15:26:07 -0700 Subject: g: upgrade_fw: check board id if CR50_RELAXED isn't defined CL:1529834 mistakenly changed an ifndef to a ifdef. If CR50_RELAXED is defined, contents_allowed should always return True. In a normal image contents_allowed should check the board id before an update. This change changes the ifdef back to ifndef which is what it should be. BUG=none BRANCH=cr50 TEST=create dbg image and try to flash an image with a mismatched board id. Make sure it runs ok. Build a non dbg image and make sure mismatched board id images are rejected. Change-Id: I1dcef5a6af4edbb431fe894ca37df5dc4e1b852e Signed-off-by: Mary Ruthven Reviewed-on: https://chromium-review.googlesource.com/1561972 Reviewed-by: Abe Levkoy Reviewed-by: Namyoon Woo --- chip/g/upgrade_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chip/g') diff --git a/chip/g/upgrade_fw.c b/chip/g/upgrade_fw.c index 9138e6b498..eba5868c3d 100644 --- a/chip/g/upgrade_fw.c +++ b/chip/g/upgrade_fw.c @@ -318,7 +318,7 @@ static int contents_allowed(uint32_t block_offset, size_t body_size, void *upgrade_data, uint8_t *error_code) { -#ifdef CR50_RELAXED +#ifndef CR50_RELAXED #ifdef CONFIG_BOARD_ID_SUPPORT if (block_offset == valid_sections.rw_base_offset) { /* This block is a rw header of the new image. */ -- cgit v1.2.1