GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/via/vx900: Ensure memory size and base are in range 

We need to ensure uma_memory_size and uma_memory_base stay within a
32-bit address range. Both of these variables are 64 bits wide, so it is
simplest to use 64 bit math when doing the bit shifts and then check if
they are in range after.

Change-Id: Idd180f31e8cff797a6499b12bc685daa993aae05
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Found-by: Coverity CID 1229665, 1229666
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32291
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Jacob Garber 2019-04-11 21:08:04 -06:00 committed by Patrick Georgi
parent 64d8b9decf
commit f5238b243f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/northbridge/via/vx900/northbridge.c
View File

@ -266,8 +266,15 @@ static void vx900_set_resources(struct device *dev)
* to be always mapped to the top of 1M, but this can be overcome with * to be always mapped to the top of 1M, but this can be overcome with
* some smart positive/subtractive resource decoding */ * some smart positive/subtractive resource decoding */
ram_resource(dev, idx++, 768, (tolmk - 768)); ram_resource(dev, idx++, 768, (tolmk - 768));
uma_memory_size = fbufk << 10;
uma_memory_base = tolmk << 10; uma_memory_size = (uint64_t)fbufk << 10;
uma_memory_base = (uint64_t)tolmk << 10;
if (uma_memory_size > UINT32_MAX)
die("uma_memory_size %llu exceeds 32-bit address range\n", uma_memory_size);
if (uma_memory_base > UINT32_MAX)
die("uma_memory_base %llu exceeds 32-bit address range\n", uma_memory_base);
//uma_resource(dev, idx++, uma_memory_base>>10, uma_memory_size>>10); //uma_resource(dev, idx++, uma_memory_base>>10, uma_memory_size>>10);