diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-02 15:21:21 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-02 15:21:21 -0700 |
| commit | 689e0e1f51b3dcea770408c180246799ec6948c6 (patch) | |
| tree | db94d452238855242836e4f6087a2c6f2b035395 | |
| parent | 68bf2e864dd16b0906525e1834bb42ce0d3cd12c (diff) | |
| parent | cbb74e22d97462c412b1b691bdf4c28c1f122e22 (diff) | |
Merge "platform: msm_shared: Ensure DT updates stays within aboot range."
| -rwxr-xr-x | platform/msm_shared/dev_tree.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c index e00aaff7..e9b24323 100755 --- a/platform/msm_shared/dev_tree.c +++ b/platform/msm_shared/dev_tree.c @@ -1269,6 +1269,12 @@ int update_device_tree(void *fdt, const char *cmdline, return ret; } + if (check_aboot_addr_range_overlap((uint32_t)fdt, + (fdt_totalsize(fdt) + DTB_PAD_SIZE))) { + dprintf(CRITICAL, "Error: Fdt addresses overlap with aboot addresses.\n"); + return ret; + } + /* Add padding to make space for new nodes and properties. */ ret = fdt_open_into(fdt, fdt, fdt_totalsize(fdt) + DTB_PAD_SIZE); if (ret!= 0) |