| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859 |
- From 7346c1e192d63cd35f99c7e845e53c5d4d0bdc24 Mon Sep 17 00:00:00 2001
- From: Teddy Reed <teddy.reed@gmail.com>
- Date: Sat, 9 Jun 2018 11:45:20 -0400
- Subject: [PATCH] vboot: Do not use hashed-strings offset
- 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>
- Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit;
- h=7346c1e192d63cd35f99c7e845e53c5d4d0bdc24]
- CVE: CVE-2018-1000205
- Signed-off-by: Changqing Li <changqing.li@windriver.com>
- ---
- common/image-sig.c | 7 +++++--
- tools/image-host.c | 1 +
- 2 files changed, 6 insertions(+), 2 deletions(-)
- diff --git a/common/image-sig.c b/common/image-sig.c
- index 8d2fd10..5a269d3 100644
- --- a/common/image-sig.c
- +++ b/common/image-sig.c
- @@ -377,8 +377,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode,
- /* Add the strings */
- strings = fdt_getprop(fit, noffset, "hashed-strings", NULL);
- 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]);
- count++;
- }
- diff --git a/tools/image-host.c b/tools/image-host.c
- index 8e43671..be2d59b 100644
- --- a/tools/image-host.c
- +++ b/tools/image-host.c
- @@ -135,6 +135,7 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value,
-
- ret = fdt_setprop(fit, noffset, "hashed-nodes",
- region_prop, region_proplen);
- + /* This is a legacy offset, it is unused, and must remain 0. */
- strdata[0] = 0;
- strdata[1] = cpu_to_fdt32(string_size);
- if (!ret) {
- --
- 2.7.4
|
