Commit cc7ed269 authored by Yaroslav K's avatar Yaroslav K Committed by Bin Meng

cbfs: Fix incorrect CBFS file header size being used

This fixes incorrect filenames in cbfsls output.
Signed-off-by: default avatarYaroslav K. <yar444@gmail.com>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
[clean up checkpatch errors and warnings]
Signed-off-by: default avatarBin Meng <bmeng.cn@gmail.com>
parent cd379a2d
......@@ -97,8 +97,8 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
}
swap_file_header(&header, fileHeader);
if (header.offset < sizeof(const struct cbfs_cachenode *) ||
header.offset > header.len) {
if (header.offset < sizeof(struct cbfs_fileheader) ||
header.offset > header.len) {
file_cbfs_result = CBFS_BAD_FILE;
return -1;
}
......@@ -106,9 +106,9 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
newNode->type = header.type;
newNode->data = start + header.offset;
newNode->data_length = header.len;
name_len = header.offset - sizeof(struct cbfs_cachenode *);
name_len = header.offset - sizeof(struct cbfs_fileheader);
newNode->name = (char *)fileHeader +
sizeof(struct cbfs_cachenode *);
sizeof(struct cbfs_fileheader);
newNode->name_length = name_len;
newNode->checksum = header.checksum;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment