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

Fix Coverity #343008, Side affect in assertion

Browse source 
This patch simply splits off the increment of next_xlat into a separate
statement to ensure consistent behaviour if the assert was to ever be
removed.

Change-Id: I827f601ccea55f4da9442048419c9b8cc0c5d22e
Signed-off-by: Justin Chadwell <justin.chadwell@arm.com>
This commit is contained in:
Justin Chadwell 2019-07-23 09:48:38 +01:00
parent dbff52633a
commit 4249e8b94f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/xlat_tables/aarch32/nonlpae_tables.c
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2016-2017, Linaro Limited. All rights reserved. * Copyright (c) 2016-2017, Linaro Limited. All rights reserved.
* Copyright (c) 2014-2017, Arm Limited. All rights reserved. * Copyright (c) 2014-2019, Arm Limited. All rights reserved.
* Copyright (c) 2014, STMicroelectronics International N.V. * Copyright (c) 2014, STMicroelectronics International N.V.
* All rights reserved. * All rights reserved.
* *
@ -445,7 +445,8 @@ static mmap_region_t *init_xlation_table_inner(mmap_region_t *mm,
} else { } else {
xlat_table = (unsigned long)mmu_l2_base + xlat_table = (unsigned long)mmu_l2_base +
next_xlat * MMU32B_L2_TABLE_SIZE; next_xlat * MMU32B_L2_TABLE_SIZE;
assert(++next_xlat <= MAX_XLAT_TABLES); next_xlat++;
assert(next_xlat <= MAX_XLAT_TABLES);
memset((char *)xlat_table, 0, memset((char *)xlat_table, 0,
MMU32B_L2_TABLE_SIZE); MMU32B_L2_TABLE_SIZE);