adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

xtensa: userspace: fix uninitialized return values in mpu_map_region_add

Browse source 
Ensure that *first_idx is populated for the case of adding entries
to an empty table

Signed-off-by: Anthony Giardina <anthony.giardina@intel.com>
This commit is contained in:
Giardina, Anthony 2024-05-02 04:02:24 +00:00 committed by Anas Nashif
parent a2386efbce
commit 809c0923c6
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/xtensa/core/mpu.c
View file

@ -443,6 +443,8 @@ static int mpu_map_region_add(struct xtensa_mpu_map *map,
xtensa_mpu_entry_set(entry_slot_s, start_addr, true,
access_rights, memory_type);
first_enabled_idx = XTENSA_MPU_NUM_ENTRIES - 1;
goto end;
} else {
/*
* Populate the last two entries to indicate
@ -459,6 +461,8 @@ static int mpu_map_region_add(struct xtensa_mpu_map *map,
xtensa_mpu_entry_set(entry_slot_e, end_addr, false,
XTENSA_MPU_ACCESS_P_NA_U_NA,
CONFIG_XTENSA_MPU_DEFAULT_MEM_TYPE);
first_enabled_idx = XTENSA_MPU_NUM_ENTRIES - 2;
goto end;
}
ret = 0;
@ -595,6 +599,7 @@ static int mpu_map_region_add(struct xtensa_mpu_map *map,
xtensa_mpu_entry_attributes_set(&entries[idx], access_rights, memory_type);
}
end:
if (first_idx != NULL) {
*first_idx = first_enabled_idx;
}