sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in david_s5/nuttx/upstream_prio_fixes (pull request #268)

Browse Source 
semaphore:sem_boostholderprio prevent overrun of pend_reprios

Approved-by: Gregory Nutt
This commit is contained in:
David Sidrane 2017-03-14 00:07:32 +00:00 committed by Gregory Nutt
commit a3d7cdb3fe
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sched/semaphore/sem_holder.c
View File

@ -125,7 +125,7 @@ static inline FAR struct semholder_s *sem_allocholder(sem_t *sem)
pholder = NULL;
}
DEBUGASSERT(pholder != NULL)
DEBUGASSERT(pholder != NULL);
return pholder;
}
@ -379,8 +379,16 @@ static int sem_boostholderprio(FAR struct semholder_s *pholder,
* saved priority and not to the base priority.
*/
htcb->pend_reprios[htcb->npend_reprio] = rtcb->sched_priority;
htcb->npend_reprio++;
if (htcb->npend_reprio < CONFIG_SEM_NNESTPRIO)
{
htcb->pend_reprios[htcb->npend_reprio] = rtcb->sched_priority;
htcb->npend_reprio++;
}
else
{
serr("ERROR: CONFIG_SEM_NNESTPRIO exceeded\n");
DEBUGASSERT(htcb->npend_reprio < CONFIG_SEM_NNESTPRIO);
}
}
}