M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

flash_storage: avoid crash if a record size gets corrupted to be less than 6

This commit is contained in:
Yann Sionneau 2015-05-27 12:55:52 +02:00
parent 4bf7875b87
commit c32133b815
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
soc/runtime/flash_storage.c
View File

@ -61,6 +61,13 @@ static int record_iter_next(struct iter_state *is, struct record *record, int *f
if(record->size == END_MARKER) if(record->size == END_MARKER)
return 0; return 0;
if(record->size < 6) {
printf("flash_storage might be corrupted: record size is %u (<6) at address %08x\n", record->size, record->raw_record);
if(fatal)
*fatal = 1;
return 0;
}
if(is->seek > is->buf_len - sizeof(record->size) - 2) { /* 2 is the minimum key length */ if(is->seek > is->buf_len - sizeof(record->size) - 2) { /* 2 is the minimum key length */
printf("flash_storage might be corrupted: END_MARKER missing at the end of the storage sector\n"); printf("flash_storage might be corrupted: END_MARKER missing at the end of the storage sector\n");
if(fatal) if(fatal)