leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: cbfs: fix locating the cbfs header

Browse Source 
The value at the end of the rom is not a pointer, it is an offset
relative to the end of rom.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2018-02-15 07:40:11 +01:00 committed by Simon Glass
parent 33222c8a2c
commit 44683170f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/cbfs/cbfs.c
View File

@ -168,9 +168,9 @@ static int file_cbfs_load_header(uintptr_t end_of_rom,
struct cbfs_header *header) struct cbfs_header *header)
{ {
struct cbfs_header *header_in_rom; struct cbfs_header *header_in_rom;
int32_t offset = *(u32 *)(end_of_rom - 3);
header_in_rom = (struct cbfs_header *)(uintptr_t) header_in_rom = (struct cbfs_header *)(end_of_rom + offset + 1);
*(u32 *)(end_of_rom - 3);
swap_header(header, header_in_rom); swap_header(header, header_in_rom);
if (header->magic != good_magic || header->offset > if (header->magic != good_magic || header->offset >