interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtos/riot: fix out-of-bounds writes when target is corrupted 

This protects against out-of-bounds writes when the memory
of RIOT's scheduler is corrupted.
This memory can be corrupted because of:
 - Programming errors
 - The scheduler not yet having been initialised
 - An incorrect symbol file being used during debugging.

This error can result in OpenOCD segfaulting. Valgrind was
used to find the approximate location of the error.

Change-Id: I60e7d7c245b8c4e38f4c98cb0c0347a9b5ec3177
Signed-off-by: Sebastiaan de Schaetzen <sebastiaan.de.schaetzen@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/6381
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Sebastiaan de Schaetzen 2021-07-27 15:06:57 +02:00 committed by Antonio Borneo
parent 085dd21a16
commit 013a0e88d2
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/rtos/riot.c
View File

@ -118,7 +118,7 @@ const struct rtos_type riot_rtos = {
static int riot_update_threads(struct rtos *rtos) static int riot_update_threads(struct rtos *rtos)
{ {
int retval; int retval;
unsigned int tasks_found = 0; int tasks_found = 0;
const struct riot_params *param; const struct riot_params *param;
if (!rtos) if (!rtos)
@ -170,7 +170,6 @@ static int riot_update_threads(struct rtos *rtos)
riot_symbol_list[RIOT_NUM_THREADS].name); riot_symbol_list[RIOT_NUM_THREADS].name);
return retval; return retval;
} }
rtos->thread_count = thread_count;
/* read the maximum number of threads */ /* read the maximum number of threads */
uint8_t max_threads = 0; uint8_t max_threads = 0;
@ -182,6 +181,11 @@ static int riot_update_threads(struct rtos *rtos)
riot_symbol_list[RIOT_MAX_THREADS].name); riot_symbol_list[RIOT_MAX_THREADS].name);
return retval; return retval;
} }
if (thread_count > max_threads) {
LOG_ERROR("Thread count is invalid");
return ERROR_FAIL;
}
rtos->thread_count = thread_count;
/* Base address of thread array */ /* Base address of thread array */
uint32_t threads_base = rtos->symbols[RIOT_THREADS_BASE].address; uint32_t threads_base = rtos->symbols[RIOT_THREADS_BASE].address;
@ -211,6 +215,9 @@ static int riot_update_threads(struct rtos *rtos)
char buffer[32]; char buffer[32];
for (unsigned int i = 0; i < max_threads; i++) { for (unsigned int i = 0; i < max_threads; i++) {
if (tasks_found == rtos->thread_count)
break;
/* get pointer to tcb_t */ /* get pointer to tcb_t */
uint32_t tcb_pointer = 0; uint32_t tcb_pointer = 0;
retval = target_read_u32(rtos->target, retval = target_read_u32(rtos->target,