SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/core: Fix fit_load_fdt() error API violations

Browse Source 
fit_load_fdt() passes @errp to fit_image_addr(), then recovers from
ENOENT failures.  Passing @errp is wrong, because it works only as
long as @errp is neither @error_fatal nor @error_abort.  Error
recovery dereferences @errp.  That's also wrong; see the big comment
in error.h.  Error recovery can leave *errp pointing to a freed
Error object.  Wrong, it must be null on success.  Messed up in
commit 3eb99edb48 "loader-fit: Wean off error_printf()".

No caller actually passes such values, or uses *errp on success.

Fix anyway: splice in a local Error *err, and error_propagate().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20191204093625.14836-8-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
Markus Armbruster 2019-12-04 10:36:14 +01:00
parent 49e3e11f8f
commit bc0e339b01
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/core/loader-fit.c
View File

@ -178,11 +178,12 @@ static int fit_load_fdt(const struct fit_loader *ldr, const void *itb,
int cfg, void *opaque, const void *match_data, int cfg, void *opaque, const void *match_data,
hwaddr kernel_end, Error **errp) hwaddr kernel_end, Error **errp)
{ {
Error *err = NULL;
const char *name; const char *name;
const void *data; const void *data;
const void *load_data; const void *load_data;
hwaddr load_addr; hwaddr load_addr;
int img_off, err; int img_off;
size_t sz; size_t sz;
int ret; int ret;
@ -197,13 +198,13 @@ static int fit_load_fdt(const struct fit_loader *ldr, const void *itb,
return -EINVAL; return -EINVAL;
} }
err = fit_image_addr(itb, img_off, "load", &load_addr, errp); ret = fit_image_addr(itb, img_off, "load", &load_addr, &err);
if (err == -ENOENT) { if (ret == -ENOENT) {
load_addr = ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB); load_addr = ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB);
error_free(*errp); error_free(err);
} else if (err) { } else if (ret) {
error_prepend(errp, "unable to read FDT load address from FIT: "); error_propagate_prepend(errp, err,
ret = err; "unable to read FDT load address from FIT: ");
goto out; goto out;
} }