erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

region: Turn region_end() into an inclusive region_last()

Browse source 
The current region_end() implementation is susceptible to overflow
if the region is at the end of the addressable space. A common case
with the memory-mapped flash of x86 directly below the 32-bit limit.

Note: This patch also changes console output to inclusive limits.
IMO, to the better.

Change-Id: Ic4bd6eced638745b7e845504da74542e4220554a
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79946
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Nico Huber 2024-01-14 14:26:37 +01:00 • committed by Julius Werner
commit 41feb32559
8 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cpu/x86/smm/smm_module_loader.c
View file

@ -341,7 +341,7 @@ static void setup_smihandler_params(struct smm_runtime *mod_params,
}
for (int i = 0; i < loader_params->num_cpus; i++)
mod_params->save_state_top[i] = region_end(&cpus[i].ss);
mod_params->save_state_top[i] = region_last(&cpus[i].ss) + 1;
if (CONFIG(RUNTIME_CONFIGURABLE_SMM_LOGLEVEL))
mod_params->smm_log_level = mainboard_set_smm_log_level();
@ -371,7 +371,7 @@ static void setup_smihandler_params(struct smm_runtime *mod_params,
static void print_region(const char *name, const struct region region)
{
printk(BIOS_DEBUG, "%-12s [0x%zx-0x%zx]\n", name, region_offset(&region),
region_end(&region));
region_last(&region));
}
/* STM + Handler + (Stub + Save state) * CONFIG_MAX_CPUS + stacks + page tables*/
@ -482,7 +482,7 @@ int smm_load_module(const uintptr_t smram_base, const size_t smram_size,
return -1;
const struct region smram = region_create(smram_base, smram_size);
const uintptr_t smram_top = region_end(&smram);
const uintptr_t smram_top = region_last(&smram) + 1;
const size_t stm_size =
CONFIG(STM) ? CONFIG_MSEG_SIZE + CONFIG_BIOS_RESOURCE_LIST_SIZE : 0;