Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 14:55:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "xlat_tables_v2: simplify end address checks in mmap_add_region_check()" into integration

Browse source
This commit is contained in:
Soby Mathew 2020-01-24 12:53:18 +00:00 • committed by TrustedFirmware Code Review
commit 064d3f6418
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/xlat_tables_v2/xlat_tables_core.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -688,10 +688,10 @@ static int mmap_add_region_check(const xlat_ctx_t *ctx, const mmap_region_t *mm)
if ((base_pa > end_pa) || (base_va > end_va)) if ((base_pa > end_pa) || (base_va > end_va))
return -ERANGE; return -ERANGE;
if ((base_va + (uintptr_t)size - (uintptr_t)1) > ctx->va_max_address) if (end_va > ctx->va_max_address)
return -ERANGE; return -ERANGE;
if ((base_pa + (unsigned long long)size - 1ULL) > ctx->pa_max_address) if (end_pa > ctx->pa_max_address)
return -ERANGE; return -ERANGE;
/* Check that there is space in the ctx->mmap array */ /* Check that there is space in the ctx->mmap array */