Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

sched/irq: handle NULL ISR handler in irq_default_handler

Browse Source 
Add null-check for ISR handler before invoking in irq_default_handler.
Fix comment documentation and initialize return value to IRQ_WAKE_THREAD.
Ensures safe handler invocation when isr parameter is NULL in threaded IRQ mode.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5
2025-03-12 13:03:19 +08:00
committed by Xiang Xiao
parent 0e5323370f
commit e143acfc46
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/irq/irq_attach_thread.c
+5 -3
View File
@@ -72,8 +72,10 @@ static int irq_default_handler(int irq, FAR void *regs, FAR void *arg)
FAR struct irq_thread_info_s *info = arg; FAR struct irq_thread_info_s *info = arg;
int ret = IRQ_WAKE_THREAD; int ret = IRQ_WAKE_THREAD;
DEBUGASSERT(info->handler != NULL); if (info->handler != NULL)
ret = info->handler(irq, regs, info->arg); {
ret = info->handler(irq, regs, info->arg);
}
if (ret == IRQ_WAKE_THREAD) if (ret == IRQ_WAKE_THREAD)
{ {
@@ -133,7 +135,7 @@ static int isr_thread_main(int argc, FAR char *argv[])
* irq - Irq num * irq - Irq num
* isr - Function to be called when the IRQ occurs, called in interrupt * isr - Function to be called when the IRQ occurs, called in interrupt
* context. * context.
* If isr is NULL the default handler is installed(irq_default_handler). * If isr is NULL, isrthread will be called.
* isrthread - called in thread context, If the isrthread is NULL, * isrthread - called in thread context, If the isrthread is NULL,
* then the ISR is being detached. * then the ISR is being detached.
* arg - privdate data * arg - privdate data
sched/irq/irq_attach_wqueue.c
+6 -3
View File
@@ -128,9 +128,12 @@ static void irq_work_handler(FAR void *arg)
static int irq_default_handler(int irq, FAR void *regs, FAR void *arg) static int irq_default_handler(int irq, FAR void *regs, FAR void *arg)
{ {
FAR struct irq_work_info_s *info = arg; FAR struct irq_work_info_s *info = arg;
int ret; int ret = IRQ_WAKE_THREAD;
ret = info->handler(irq, regs, arg); if (info->handler != NULL)
{
ret = info->handler(irq, regs, info->arg);
}
if (ret == IRQ_WAKE_THREAD) if (ret == IRQ_WAKE_THREAD)
{ {
@@ -156,7 +159,7 @@ static int irq_default_handler(int irq, FAR void *regs, FAR void *arg)
* irq - Irq num * irq - Irq num
* isr - Function to be called when the IRQ occurs, called in interrupt * isr - Function to be called when the IRQ occurs, called in interrupt
* context. * context.
* If isr is NULL the default handler is installed(irq_default_handler). * If isr is NULL, isrthread will be called.
* isrwork - called in thread context, If the isrwork is NULL, * isrwork - called in thread context, If the isrwork is NULL,
* then the ISR is being detached. * then the ISR is being detached.
* arg - privdate data * arg - privdate data