[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/18] hw/core: Fix fit_load_fdt() error handling violations
From: |
Markus Armbruster |
Subject: |
[PATCH v2 07/18] hw/core: Fix fit_load_fdt() error handling violations |
Date: |
Wed, 4 Dec 2019 10:36:14 +0100 |
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. Messed up in
commit 3eb99edb48 "loader-fit: Wean off error_printf()".
No caller actually passes such values.
Fix anyway: splice in a local Error *err, and error_propagate().
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/core/loader-fit.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
index 953b16bc82..c465921b8f 100644
--- a/hw/core/loader-fit.c
+++ b/hw/core/loader-fit.c
@@ -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,
hwaddr kernel_end, Error **errp)
{
+ Error *err = NULL;
const char *name;
const void *data;
const void *load_data;
hwaddr load_addr;
- int img_off, err;
+ int img_off;
size_t sz;
int ret;
@@ -197,13 +198,13 @@ static int fit_load_fdt(const struct fit_loader *ldr,
const void *itb,
return -EINVAL;
}
- err = fit_image_addr(itb, img_off, "load", &load_addr, errp);
- if (err == -ENOENT) {
+ ret = fit_image_addr(itb, img_off, "load", &load_addr, &err);
+ if (ret == -ENOENT) {
load_addr = ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB);
- error_free(*errp);
- } else if (err) {
- error_prepend(errp, "unable to read FDT load address from FIT: ");
- ret = err;
+ error_free(err);
+ } else if (ret) {
+ error_propagate_prepend(errp, err,
+ "unable to read FDT load address from FIT: ");
goto out;
}
--
2.21.0
- Re: [PATCH v2 04/18] tests: Clean up initialization of Error *err variables, (continued)
- [PATCH v2 11/18] s390x/event-facility: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 13/18] s390x/cpumodel: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 08/18] hw/ipmi: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 05/18] exec: Fix file_ram_alloc() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 17/18] hw/intc/s390: Simplify error handling in kvm_s390_flic_realize(), Markus Armbruster, 2019/12/04
- [PATCH v2 01/18] crypto: Fix certificate file error handling crash bug, Markus Armbruster, 2019/12/04
- [PATCH v2 07/18] hw/core: Fix fit_load_fdt() error handling violations,
Markus Armbruster <=
- [PATCH v2 03/18] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/04
- [PATCH v2 18/18] tests-blockjob: Use error_free_or_abort(), Markus Armbruster, 2019/12/04
- [PATCH v2 14/18] s390x/cpumodel: Fix query-cpu-model-FOO error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 06/18] hw/acpi: Fix legacy CPU plug error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 10/18] memory-device: Fix memory pre-plug error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 16/18] error: Clean up unusual names of Error * variables, Markus Armbruster, 2019/12/04
- [PATCH v2 15/18] s390x/cpumodel: Fix query-cpu-definitions error API violations, Markus Armbruster, 2019/12/04