Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

vboot: Do not use hashed-strings offset

Browse source 
The hashed-strings signature property includes two uint32_t values.
The first is unneeded as there should never be a start offset into the
strings region. The second, the size, is needed because the added
signature node appends to this region.

See tools/image-host.c, where a static 0 value is used for the offset.

Signed-off-by: Teddy Reed <teddy.reed@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Teddy Reed 2018-06-09 11:45:20 -04:00 committed by Tom Rini
parent 72239fc85f
commit 7346c1e192
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/image-sig.c
View file

@ -377,8 +377,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode,
/* Add the strings */ /* Add the strings */
strings = fdt_getprop(fit, noffset, "hashed-strings", NULL); strings = fdt_getprop(fit, noffset, "hashed-strings", NULL);
if (strings) { if (strings) {
fdt_regions[count].offset = fdt_off_dt_strings(fit) + /*
fdt32_to_cpu(strings[0]); * The strings region offset must be a static 0x0.
* This is set in tool/image-host.c
*/
fdt_regions[count].offset = fdt_off_dt_strings(fit);
fdt_regions[count].size = fdt32_to_cpu(strings[1]); fdt_regions[count].size = fdt32_to_cpu(strings[1]);
count++; count++;
} }

1
tools/image-host.c
View file

@ -135,6 +135,7 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
ret = fdt_setprop(fit, noffset, "hashed-nodes", ret = fdt_setprop(fit, noffset, "hashed-nodes",
region_prop, region_proplen); region_prop, region_proplen);
/* This is a legacy offset, it is unused, and must remain 0. */
strdata[0] = 0; strdata[0] = 0;
strdata[1] = cpu_to_fdt32(string_size); strdata[1] = cpu_to_fdt32(string_size);
if (!ret) { if (!ret) {