diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-06 01:16:54 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-06 01:16:54 +0000 |
commit | 65a82e5f4aac16b2384008be09a6e79cc43e8a91 (patch) | |
tree | 9b5717374b72030f155715d382d9d792f3fea328 | |
parent | 65b7ae5a3c4558d983e98812a5b50fe0d00a47b6 (diff) | |
parent | 38fdfacee637fb180d1e671640d7afaddc8877c6 (diff) | |
download | libufdt-android12-s2-release.tar.gz |
Snap for 7339742 from 38fdfacee637fb180d1e671640d7afaddc8877c6 to sc-releaseandroid-vts-12.0_r1android-security-12.0.0_r61android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r33android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: Id32ac8617b436a0fbe88f7d24bc5046e3153397a
-rw-r--r-- | ufdt_overlay.c | 22 |
1 files changed, 12 insertions, 10 deletions
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 @@ static enum overlay_result ufdt_apply_fragment(struct ufdt *tree, 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 enum overlay_result ufdt_apply_fragment(struct ufdt *tree, 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; } } |