Merge "platform: msm_shared: check for atags address"
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 3a78993..b68ecf4 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -157,6 +157,11 @@
break;
dtb_size = fdt_totalsize(&dtb_hdr);
+ if (check_aboot_addr_range_overlap(tags, dtb_size)) {
+ dprintf(CRITICAL, "Tags addresses overlap with aboot addresses.\n");
+ return NULL;
+ }
+
/* now that we know we have a valid DTB, we need to copy
* it somewhere aligned, like tags */
memcpy(tags, dtb, dtb_size);