GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: cbfs: Check decompressed size when loading files 

After loading compressed files in CBFS, we should check the decompressed
size is equal to the expected size. This might help us detect file
content corruption or compressor/decompressor bugs.

BUG=none
BRANCH=none
TEST=manually (we can still boot into kernel on Kukui, and verify that
     loading files from CBFS still works by seeing ChromiumOS firmware
     screen).

Change-Id: Ia756cc5477670dd0d1d8aa59d4160ab4233c6795
Signed-off-by: You-Cheng Syu <youcheng@google.com>
Reviewed-on: https://review.coreboot.org/c/31564
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
You-Cheng Syu 2019-02-26 21:41:52 +08:00 committed by Patrick Georgi
parent 5ec1d24974
commit c60c3269ec
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
payloads/libpayload/libcbfs/cbfs_core.c
View File

@ -243,13 +243,10 @@ void *cbfs_get_contents(struct cbfs_handle *handle, size_t *size, size_t limit)
} }
if (algo == CBFS_COMPRESS_NONE) { if (algo == CBFS_COMPRESS_NONE) {
if (limit != 0 && limit < on_media_size) { if (limit != 0 && limit < on_media_size)
*size = limit;
on_media_size = limit; on_media_size = limit;
} else {
*size = on_media_size; *size = on_media_size;
} }
}
void *data = m->map(m, handle->media_offset + handle->content_offset, void *data = m->map(m, handle->media_offset + handle->content_offset,
on_media_size); on_media_size);
@ -257,11 +254,16 @@ void *cbfs_get_contents(struct cbfs_handle *handle, size_t *size, size_t limit)
return NULL; return NULL;
ret = malloc(*size); ret = malloc(*size);
if (ret != NULL && if (ret != NULL) {
!cbfs_decompress(algo, data, on_media_size, ret, *size)) { size_t final_size = cbfs_decompress(algo, data, on_media_size,
ret, *size);
if (final_size != *size) {
ERROR("Expect %zu bytes but got %zu bytes after "
"decompression.\n", *size, final_size);
free(ret); free(ret);
ret = NULL; ret = NULL;
} }
}
m->unmap(m, data); m->unmap(m, data);
return ret; return ret;