[PATCH] FIT: Fix error path

[PATCH] FIT: Fix error path

[Sascha Hauer]

In case of error of_unflatten_dtb() returns an ERR_PTR. Make sure
that handle->root contains NULL in this case so that we do not call
of_delete_node on the error pointer in the exit path.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 common/image-fit.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index 81433e6ecf..db5d142147 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -584,6 +584,7 @@ struct fit_handle *fit_open(const char *filename, const char *config, bool verbo
 {
 	struct fit_handle *handle = NULL;
 	const char *desc = "(no description)";
+	struct device_node *root;
 	int ret;
 
 	handle = xzalloc(sizeof(struct fit_handle));
@@ -596,12 +597,13 @@ struct fit_handle *fit_open(const char *filename, const char *config, bool verbo
 		goto err;
 	}
 
-	handle->root = of_unflatten_dtb(handle->fit);
-	if (IS_ERR(handle->root)) {
-		ret = PTR_ERR(handle->root);
+	root = of_unflatten_dtb(handle->fit);
+	if (IS_ERR(root)) {
+		ret = PTR_ERR(root);
 		goto err;
 	}
 
+	handle->root = root;
 	handle->verify = verify;
 
 	of_property_read_string(handle->root, "description", &desc);
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox