[flashrom] [PATCH] Fix eraseblock walking
Carl-Daniel Hailfinger
c-d.hailfinger.devel.2006 at gmx.net
Mon Nov 23 03:26:37 CET 2009
Fix eraseblock walking and add a few more checks to make sure such bugs
get caught in the future. I found this bug during a code review.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Index: flashrom-blockerase_walk_fix/flashrom.c
===================================================================
--- flashrom-blockerase_walk_fix/flashrom.c (Revision 769)
+++ flashrom-blockerase_walk_fix/flashrom.c (Arbeitskopie)
@@ -563,10 +563,11 @@
int erase_flash(struct flashchip *flash)
{
int i, j, k, ret = 0, found = 0;
+ unsigned int start, len;
printf("Erasing flash chip... ");
for (k = 0; k < NUM_ERASEFUNCTIONS; k++) {
- unsigned long done = 0;
+ unsigned int done = 0;
struct block_eraser eraser = flash->block_erasers[k];
printf_debug("Looking at blockwise erase function %i... ", k);
@@ -594,13 +595,23 @@
* members so the loop below won't be executed for them.
*/
for (j = 0; j < eraser.eraseblocks[i].count; j++) {
- ret = eraser.block_erase(flash, done + eraser.eraseblocks[i].size * j, eraser.eraseblocks[i].size);
+ start = done + eraser.eraseblocks[i].size * j;
+ len = eraser.eraseblocks[i].size;
+ printf_debug("0x%06x-0x%06x, ", start, len);
+ ret = eraser.block_erase(flash, start, len);
if (ret)
break;
}
if (ret)
break;
+ done += eraser.eraseblocks[i].count *
+ eraser.eraseblocks[i].size;
}
+ printf_debug("\n");
+ if (done != flash->total_size * 1024)
+ fprintf(stderr, "ERROR: Erase region walking erased "
+ "0x%06x bytes total, expected 0x%06x bytes.",
+ done, flash->total_size * 1024);
/* If everything is OK, don't try another erase function. */
if (!ret)
break;
--
Developer quote of the month:
"We are juggling too many chainsaws and flaming arrows and tigers."
More information about the flashrom
mailing list