commit 01856f80fb3561ac21159189a3cf0618ba16eef8
author Hridya Valsaraju <hridya@google.com> Wed May 05 17:48:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 05 17:48:46 2021 +0000
tree 9b5717374b72030f155715d382d9d792f3fea328
parent 48ab4764d49390745643b4a3531e762925d441ac
parent f6b572a2f682196651362713820ed02b6d7e29a9

Throw an error on all overlay application errors am: f6b572a2f6

Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088

Change-Id: I6f96de7a192addd3a20d8cb22b20e0bf07d04b98

ufdt_overlay.c

diff --git a/ufdt_overlay.c b/ufdt_overlay.c
index 019545f..c432cd4 100644
--- a/ufdt_overlay.c
+++ b/ufdt_overlay.c
@@ -363,18 +363,18 @@
   struct ufdt_node *target_node = NULL;
   struct ufdt_node *overlay_node = NULL;
 
+  overlay_node = ufdt_node_get_node_by_path(frag_node, "__overlay__");
+  if (overlay_node == NULL) {
+    return OVERLAY_RESULT_MISSING_OVERLAY;
+  }
+
   enum overlay_result result =
       ufdt_overlay_get_target(tree, frag_node, &target_node);
   if (target_node == NULL) {
+    dto_error("Unable to resolve target for %s\n", ufdt_node_name(frag_node));
     return result;
   }
 
-  overlay_node = ufdt_node_get_node_by_path(frag_node, "__overlay__");
-  if (overlay_node == NULL) {
-    dto_error("missing __overlay__ sub-node\n");
-    return OVERLAY_RESULT_MISSING_OVERLAY;
-  }
-
   int err = ufdt_overlay_node(target_node, overlay_node, pool);
 
   if (err < 0) {
@@ -392,15 +392,17 @@
 static int ufdt_overlay_apply_fragments(struct ufdt *main_tree,
                                         struct ufdt *overlay_tree,
                                         struct ufdt_node_pool *pool) {
-  enum overlay_result err;
+  enum overlay_result ret;
   struct ufdt_node **it;
   /*
    * This loop may iterate to subnodes that's not a fragment node.
-   * In such case, ufdt_apply_fragment would fail with return value = -1.
+   * We must fail for any other error.
    */
   for_each_node(it, overlay_tree->root) {
-    err = ufdt_apply_fragment(main_tree, *it, pool);
-    if (err == OVERLAY_RESULT_MERGE_FAIL) {
+    ret = ufdt_apply_fragment(main_tree, *it, pool);
+    if ((ret != OVERLAY_RESULT_OK) && (ret != OVERLAY_RESULT_MISSING_OVERLAY)) {
+      dto_error("failed to apply overlay fragment %s ret: %d\n",
+                ufdt_node_name(*it), ret);
       return -1;
     }
   }