[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 08/35] hw/core: Fix fit_load_fdt() error API violations
From: |
Markus Armbruster |
Subject: |
[PULL v2 08/35] hw/core: Fix fit_load_fdt() error API violations |
Date: |
Wed, 18 Dec 2019 09:16:54 +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. 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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <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
- [PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init(), (continued)
- [PULL v2 15/35] net/net: Clean up variable shadowing in net_client_init(), Markus Armbruster, 2019/12/18
- [PULL v2 31/35] hw/usb: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 24/35] block/snapshot: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 35/35] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/18
- [PULL v2 29/35] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/18
- [PULL v2 32/35] include/qom/object.h: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 04/35] io: Fix Error usage in a comment <example>, Markus Armbruster, 2019/12/18
- [PULL v2 28/35] hw/s390x: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/18
- [PULL v2 33/35] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Markus Armbruster, 2019/12/18
- [PULL v2 03/35] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/18
- [PULL v2 08/35] hw/core: Fix fit_load_fdt() error API violations,
Markus Armbruster <=
- [PULL v2 12/35] error: Clean up unusual names of Error * variables, Markus Armbruster, 2019/12/18
- [PULL v2 17/35] hmp: drop Error pointer indirection in hmp_handle_error, Markus Armbruster, 2019/12/18
- [PULL v2 34/35] hw/vfio/ap: drop local_err from vfio_ap_realize, Markus Armbruster, 2019/12/18
- [PULL v2 09/35] hw/ipmi: Fix realize() error API violations, Markus Armbruster, 2019/12/18
- Re: [PULL v2 00/35] Error reporting patches for 2019-12-17, Peter Maydell, 2019/12/20