Skip to content

GitLab

Commit 3aa2abbb authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge "SPMD: fix boundary check if manifest is page aligned" into integration

parents b5cfb045 fdd5f9e6
Hide whitespace changes
Inline Side-by-side
plat/common/plat_spmd_manifest.c
View file @ 3aa2abbb
...@@ -128,7 +128,13 @@ int plat_spm_core_manifest_load(spmc_manifest_attribute_t *manifest, ...@@ -128,7 +128,13 @@ int plat_spm_core_manifest_load(spmc_manifest_attribute_t *manifest,
*/ */
pm_base = (uintptr_t)pm_addr; pm_base = (uintptr_t)pm_addr;
pm_base_align = page_align(pm_base, UP); pm_base_align = page_align(pm_base, UP);
mapped_size = pm_base_align - pm_base;
if (pm_base == pm_base_align) {
/* Page aligned */
mapped_size = PAGE_SIZE;
} else {
mapped_size = pm_base_align - pm_base;
}
/* Check space within the page at least maps the FDT header */ /* Check space within the page at least maps the FDT header */
if (mapped_size < sizeof(struct fdt_header)) { if (mapped_size < sizeof(struct fdt_header)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment