Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 20:34:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cbfs: Fix incorrect CBFS file header size being used

Browse source 
This fixes incorrect filenames in cbfsls output.

Signed-off-by: Yaroslav K. <yar444@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[clean up checkpatch errors and warnings]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Yaroslav K 2016-08-08 20:32:15 -07:00 • committed by Bin Meng
parent cd379a2dc8
commit cc7ed26934
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/cbfs/cbfs.c
View file

@ -97,7 +97,7 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
} }
swap_file_header(&header, fileHeader); swap_file_header(&header, fileHeader);
if (header.offset < sizeof(const struct cbfs_cachenode *) || if (header.offset < sizeof(struct cbfs_fileheader) ||
header.offset > header.len) { header.offset > header.len) {
file_cbfs_result = CBFS_BAD_FILE; file_cbfs_result = CBFS_BAD_FILE;
return -1; return -1;
@ -106,9 +106,9 @@ static int file_cbfs_next_file(u8 *start, u32 size, u32 align,
newNode->type = header.type; newNode->type = header.type;
newNode->data = start + header.offset; newNode->data = start + header.offset;
newNode->data_length = header.len; 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 + newNode->name = (char *)fileHeader +
sizeof(struct cbfs_cachenode *); sizeof(struct cbfs_fileheader);
newNode->name_length = name_len; newNode->name_length = name_len;
newNode->checksum = header.checksum; newNode->checksum = header.checksum;