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

Merge "fix(el3-spmc): fix incorrect CASSERT" into integration

Browse source
This commit is contained in:
Olivier Deprez 2023-07-25 15:32:54 +02:00 • committed by TrustedFirmware Code Review
commit abe80629fc
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/std_svc/spm/el3_spmc/spmc_shared_mem.c
View file

@ -743,10 +743,12 @@ spmc_validate_mtd_start(struct ffa_mtd *desc, uint32_t ffa_version,
/* /*
* Overflow is impossible: the arithmetic happens in at least 64-bit * Overflow is impossible: the arithmetic happens in at least 64-bit
* precision, but all of the operands are bounded by UINT32_MAX, and * precision, but all of the operands are bounded by UINT32_MAX, and
* ((2^32 - 1)^2 + (2^32 - 1) + (2^32 - 1)) = ((2^32 - 1) * (2^32 + 1)) * ((2^32 - 1) * (2^32 - 1) + (2^32 - 1) + (2^32 - 1))
* = ((2^32 - 1) * ((2^32 - 1) + 1 + 1))
* = ((2^32 - 1) * (2^32 + 1))
* = (2^64 - 1). * = (2^64 - 1).
*/ */
CASSERT(sizeof(desc->emad_count == 4), assert_emad_count_max_too_large); CASSERT(sizeof(desc->emad_count) == 4, assert_emad_count_max_too_large);
emad_end = (desc->emad_count * (unsigned long long)emad_size) + emad_end = (desc->emad_count * (unsigned long long)emad_size) +
(unsigned long long)sizeof(struct ffa_comp_mrd) + (unsigned long long)sizeof(struct ffa_comp_mrd) +
(unsigned long long)emad_offset; (unsigned long long)emad_offset;