Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/69473 )
(
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: flashrom.c: Position heap alloc along side check in compare_range() ......................................................................
flashrom.c: Position heap alloc along side check in compare_range()
Change-Id: I0386ac4c09a541cb9a659b2410ce49c3292ecc6e Signed-off-by: Edward O'Callaghan quasisec@google.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/69473 Reviewed-by: Felix Singer felixsinger@posteo.net Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Alexander Goncharov chat@joursoir.net Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M flashrom.c 1 file changed, 17 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved Alexander Goncharov: Looks good to me, but someone else must approve
diff --git a/flashrom.c b/flashrom.c index 3e75eb3..18c4864 100644 --- a/flashrom.c +++ b/flashrom.c @@ -471,15 +471,16 @@ static int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len) { int ret; - uint8_t *cmpbuf = malloc(len); const uint8_t erased_value = ERASED_VALUE(flash);
+ uint8_t *cmpbuf = malloc(len); if (!cmpbuf) { msg_gerr("Out of memory!\n"); return -1; } memset(cmpbuf, erased_value, len); ret = verify_range(flash, cmpbuf, start, len); + free(cmpbuf); return ret; }