|
| From: | Philippe Mathieu-Daudé |
| Subject: | Re: [PATCH v8 01/21] hw/core/loader-fit: fix freeing errp in fit_load_fdt |
| Date: | Fri, 6 Dec 2019 08:41:24 +0100 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 |
On 12/5/19 6:46 PM, Vladimir Sementsov-Ogievskiy wrote:
fit_load_fdt forget to check that errp is not NULL and to zero it after freeing. Fix it. Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden> Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/core/loader-fit.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
index 953b16bc82..3ee9fb2f2e 100644
--- a/hw/core/loader-fit.c
+++ b/hw/core/loader-fit.c
@@ -200,7 +200,10 @@ static int fit_load_fdt(const struct fit_loader *ldr,
const void *itb,
err = fit_image_addr(itb, img_off, "load", &load_addr, errp);
if (err == -ENOENT) {
load_addr = ROUND_UP(kernel_end, 64 * KiB) + (10 * MiB);
- error_free(*errp);
+ if (errp) {
+ error_free(*errp);
+ *errp = NULL;
+ }
} else if (err) {
error_prepend(errp, "unable to read FDT load address from FIT: ");
ret = err;
| [Prev in Thread] | Current Thread | [Next in Thread] |