sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: Propogate compression errors back to the caller.

Browse Source 
When compression fails for whatever reason, the caller should know about it
rather than blindly assuming it worked correctly. That can prevent half
compressed data from ending up in the image.

This is currently happening for a segment of depthcharge which is triggering
a failure in LZMA. The size of the "compressed" data is never set and is
recorded as zero, and that segment effectively isn't loaded during boot.

Change-Id: Idbff01f5413d030bbf5382712780bbd0b9e83bc7
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://chromium-review.googlesource.com/187364
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit be48f3e41eaf0eaf6686c61c439095fc56883cec)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6960
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Gabe Black
2014-02-20 23:38:49 -08:00
committed by Isaac Christensen
parent 49c98dc42b
commit dbd006b082
5 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
util/cbfstool/cbfs-mkpayload.c
View File

@@ -205,8 +205,11 @@ int parse_elf_to_payload(const struct buffer *input,
segs[segments].offset = doffset;
int len;
compress((char *)&header[phdr[i].p_offset],
phdr[i].p_filesz, output->data + doffset, &len);
if (compress((char *)&header[phdr[i].p_offset],
phdr[i].p_filesz, output->data + doffset, &len)) {
buffer_delete(output);
return -1;
}
segs[segments].len = len;
/* If the compressed section is larger, then use the
@@ -261,7 +264,10 @@ int parse_flat_binary_to_payload(const struct buffer *input,
segs[0].mem_len = input->size;
segs[0].offset = doffset;
compress(input->data, input->size, output->data + doffset, &len);
if (compress(input->data, input->size, output->data + doffset, &len)) {
buffer_delete(output);
return -1;
}
segs[0].compression = algo;
segs[0].len = len;
@@ -387,7 +393,10 @@ int parse_fv_to_payload(const struct buffer *input,
segs[0].mem_len = input->size;
segs[0].offset = doffset;
compress(input->data, input->size, output->data + doffset, &len);
if (compress(input->data, input->size, output->data + doffset, &len)) {
buffer_delete(output);
return -1;
}
segs[0].compression = algo;
segs[0].len = len;