diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-16 07:58:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-16 07:58:41 -0400 |
| commit | 793fd86f722f5c5e13290be2074816b001359b76 (patch) | |
| tree | 2c9c222cf143745a81c1f38207ef69d8b1c847ce /fs/cbfs/cbfs.c | |
| parent | 177381a9f9e956353deaa56d86bec47e02995ff3 (diff) | |
| parent | 27daffe7cec26ec1462245e4e15c36d19d886221 (diff) | |
| download | u-boot-imx-793fd86f722f5c5e13290be2074816b001359b76.zip u-boot-imx-793fd86f722f5c5e13290be2074816b001359b76.tar.gz u-boot-imx-793fd86f722f5c5e13290be2074816b001359b76.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'fs/cbfs/cbfs.c')
| -rw-r--r-- | fs/cbfs/cbfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/cbfs/cbfs.c b/fs/cbfs/cbfs.c index 95a48a4..6e1107d 100644 --- a/fs/cbfs/cbfs.c +++ b/fs/cbfs/cbfs.c @@ -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; |