Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-01 08:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1617 from antonio-nino-diaz-arm/an/bugfix

Browse source 
xlat: Fix checks in mmap_add() and mmap_add_ctx()
This commit is contained in:
Dimitris Papastamos 2018-10-08 17:34:59 +01:00 • committed by GitHub
commit 3d3619c6df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/xlat_tables/xlat_tables_common.c
View file

@ -176,7 +176,7 @@ void mmap_add(const mmap_region_t *mm)
{ {
const mmap_region_t *mm_cursor = mm; const mmap_region_t *mm_cursor = mm;
while (mm_cursor->attr != 0U) { while ((mm_cursor->size != 0U) || (mm_cursor->attr != 0U)) {
mmap_add_region(mm_cursor->base_pa, mm_cursor->base_va, mmap_add_region(mm_cursor->base_pa, mm_cursor->base_va,
mm_cursor->size, mm_cursor->attr); mm_cursor->size, mm_cursor->attr);
mm_cursor++; mm_cursor++;

2
lib/xlat_tables_v2/xlat_tables_core.c
View file

@ -815,7 +815,7 @@ void mmap_add_ctx(xlat_ctx_t *ctx, const mmap_region_t *mm)
{ {
const mmap_region_t *mm_cursor = mm; const mmap_region_t *mm_cursor = mm;
while (mm_cursor->attr != 0U) { while (mm_cursor->granularity != 0U) {
mmap_add_region_ctx(ctx, mm_cursor); mmap_add_region_ctx(ctx, mm_cursor);
mm_cursor++; mm_cursor++;
} }