summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/cbfstool/fit.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c
index e3e6c32a6f..d33cb56749 100644
--- a/util/cbfstool/fit.c
+++ b/util/cbfstool/fit.c
@@ -226,13 +226,18 @@ static int parse_microcode_blob(struct cbfs_image *image,
mcu_header = rom_buffer_pointer(&image->buffer, current_offset);
+ /* Newer microcode updates include a size field, whereas older
+ * containers set it at 0 and are exactly 2048 bytes long */
+ uint32_t total_size = mcu_header->total_size
+ ? mcu_header->total_size : 2048;
+
/* Quickly sanity check a prospective microcode update. */
- if (mcu_header->total_size < sizeof(*mcu_header))
+ if (total_size < sizeof(*mcu_header))
break;
/* FIXME: Should the checksum be validated? */
mcus[num_mcus].offset = current_offset;
- mcus[num_mcus].size = mcu_header->total_size;
+ mcus[num_mcus].size = total_size;
/* Proceed to next payload. */
current_offset += mcus[num_mcus].size;