Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-16 01:34:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched: fix corner case wd_cancel assert crash

Browse Source 
There one ways can caused this:
mq_timedreceive
   TIMER IRQ do wd_timer -> wd_func1 mq_send
                         -> wd_func2 nxmq_rcvtimeout -> crash

Resolve:
Stop the watchdog when mq_send

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd
2022-09-06 16:33:58 +08:00
committed by Xiang Xiao
parent 9bff29d7e7
commit 3b04450808
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sched/mqueue/mq_rcvinternal.c
View File

@@ -298,6 +298,11 @@ ssize_t nxmq_do_receive(FAR struct mqueue_inode_s *msgq,
DEBUGASSERT(btcb != NULL);
if (WDOG_ISACTIVE(&btcb->waitdog))
{
wd_cancel(&btcb->waitdog);
}
btcb->msgwaitq = NULL;
msgq->nwaitnotfull--;
up_unblock_task(btcb);

5
sched/mqueue/mq_sndinternal.c
View File

@@ -405,6 +405,11 @@ int nxmq_do_send(FAR struct mqueue_inode_s *msgq,
DEBUGASSERT(btcb);
if (WDOG_ISACTIVE(&btcb->waitdog))
{
wd_cancel(&btcb->waitdog);
}
btcb->msgwaitq = NULL;
msgq->nwaitnotempty--;
up_unblock_task(btcb);

12
sched/signal/sig_dispatch.c
View File

@@ -363,6 +363,12 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
{
memcpy(&stcb->sigunbinfo, info, sizeof(siginfo_t));
stcb->sigwaitmask = NULL_SIGNAL_SET;
if (WDOG_ISACTIVE(&stcb->waitdog))
{
wd_cancel(&stcb->waitdog);
}
up_unblock_task(stcb);
leave_critical_section(flags);
}
@@ -399,6 +405,12 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info)
{
memcpy(&stcb->sigunbinfo, info, sizeof(siginfo_t));
stcb->sigwaitmask = NULL_SIGNAL_SET;
if (WDOG_ISACTIVE(&stcb->waitdog))
{
wd_cancel(&stcb->waitdog);
}
up_unblock_task(stcb);
}