diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-01 14:29:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-01 14:29:21 -0400 |
| commit | e0718b3ab754860bd47677e6b4fc5b70da42c4ab (patch) | |
| tree | d10a15f1a7ab4ac7bb45301cc2a4560975341c6c /common/bootm.c | |
| parent | e88c9e6ff15144f64f031f6a7b9323a096ab5a4d (diff) | |
| parent | 0e29648f8e7e0aa60c0f7efe9d2efed98f8c0c6e (diff) | |
Merge tag 'dm-pull-1apr20' of git://git.denx.de/u-boot-dm
Vboot vulnerability fix
Diffstat (limited to 'common/bootm.c')
| -rw-r--r-- | common/bootm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/bootm.c b/common/bootm.c index 902c13880d..db4362a643 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -819,7 +819,8 @@ void __weak switch_to_non_secure_mode(void) #else /* USE_HOSTCC */ #if defined(CONFIG_FIT_SIGNATURE) -static int bootm_host_load_image(const void *fit, int req_image_type) +static int bootm_host_load_image(const void *fit, int req_image_type, + int cfg_noffset) { const char *fit_uname_config = NULL; ulong data, len; @@ -831,6 +832,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type) void *load_buf; int ret; + fit_uname_config = fdt_get_name(fit, cfg_noffset, NULL); memset(&images, '\0', sizeof(images)); images.verify = 1; noffset = fit_image_load(&images, (ulong)fit, @@ -878,7 +880,7 @@ int bootm_host_load_images(const void *fit, int cfg_noffset) for (i = 0; i < ARRAY_SIZE(image_types); i++) { int ret; - ret = bootm_host_load_image(fit, image_types[i]); + ret = bootm_host_load_image(fit, image_types[i], cfg_noffset); if (!err && ret && ret != -ENOENT) err = ret; } |