riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/pthread: check return value of malloc()

Browse Source 
To prevent a NULL pointer dereference on a memory constrained system,
check if malloc() was actually successful.
This commit is contained in:
Benjamin Valentin 2019-10-19 18:48:08 +02:00
parent cf81dffaee
commit 764a9e9f63
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/posix/pthread/pthread.c
View File

@ -120,6 +120,10 @@ int pthread_create(pthread_t *newthread, const pthread_attr_t *attr, void *(*sta
{ {
pthread_thread_t *pt = calloc(1, sizeof(pthread_thread_t)); pthread_thread_t *pt = calloc(1, sizeof(pthread_thread_t));
if (pt == NULL) {
return -ENOMEM;
}
kernel_pid_t pthread_pid = insert(pt); kernel_pid_t pthread_pid = insert(pt);
if (pthread_pid == KERNEL_PID_UNDEF) { if (pthread_pid == KERNEL_PID_UNDEF) {
free(pt); free(pt);
@ -134,6 +138,12 @@ int pthread_create(pthread_t *newthread, const pthread_attr_t *attr, void *(*sta
bool autofree = attr == NULL || attr->ss_sp == NULL || attr->ss_size == 0; bool autofree = attr == NULL || attr->ss_sp == NULL || attr->ss_size == 0;
size_t stack_size = attr && attr->ss_size > 0 ? attr->ss_size : PTHREAD_STACKSIZE; size_t stack_size = attr && attr->ss_size > 0 ? attr->ss_size : PTHREAD_STACKSIZE;
void *stack = autofree ? malloc(stack_size) : attr->ss_sp; void *stack = autofree ? malloc(stack_size) : attr->ss_sp;
if (stack == NULL) {
free(pt);
return -ENOMEM;
}
pt->stack = autofree ? stack : NULL; pt->stack = autofree ? stack : NULL;
if (autofree && pthread_reaper_pid != KERNEL_PID_UNDEF) { if (autofree && pthread_reaper_pid != KERNEL_PID_UNDEF) {