Commit cc7ed269341fb48b6453d013cc79ac15cb497f04
Committed by
Bin Meng
Bin Meng
1 parent
cd379a2dc8
Exists in
v2017.01-smarct4x
and in
25 other branches
cbfs: Fix incorrect CBFS file header size being used
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>
Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff
fs/cbfs/cbfs.c
| ... | ... | @@ -97,8 +97,8 @@ |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | swap_file_header(&header, fileHeader); |
| 100 | - if (header.offset < sizeof(const struct cbfs_cachenode *) || | |
| 101 | - header.offset > header.len) { | |
| 100 | + if (header.offset < sizeof(struct cbfs_fileheader) || | |
| 101 | + header.offset > header.len) { | |
| 102 | 102 | file_cbfs_result = CBFS_BAD_FILE; |
| 103 | 103 | return -1; |
| 104 | 104 | } |
| 105 | 105 | |
| ... | ... | @@ -106,9 +106,9 @@ |
| 106 | 106 | newNode->type = header.type; |
| 107 | 107 | newNode->data = start + header.offset; |
| 108 | 108 | newNode->data_length = header.len; |
| 109 | - name_len = header.offset - sizeof(struct cbfs_cachenode *); | |
| 109 | + name_len = header.offset - sizeof(struct cbfs_fileheader); | |
| 110 | 110 | newNode->name = (char *)fileHeader + |
| 111 | - sizeof(struct cbfs_cachenode *); | |
| 111 | + sizeof(struct cbfs_fileheader); | |
| 112 | 112 | newNode->name_length = name_len; |
| 113 | 113 | newNode->checksum = header.checksum; |
| 114 | 114 |