DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-09 19:36:47 +00:00
Code Issues Releases Wiki Activity

bugfix: 修正中断注册时，对名称字符串的处理错误问题

Browse Source
This commit is contained in:
fslongjin 2022-07-11 17:22:27 +08:00
parent dbed64a4ef
commit 88bcbdc681
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/exception/irq.c
View File

@ -10,8 +10,7 @@
#include "../common/asm.h" #include "../common/asm.h"
#include "../common/printk.h" #include "../common/printk.h"
#include "gate.h" #include "gate.h"
#include <mm/slab.h>
// 保存函数调用现场的寄存器 // 保存函数调用现场的寄存器
#define SAVE_ALL_REGS \ #define SAVE_ALL_REGS \
@ -166,7 +165,12 @@ int irq_register(ul irq_num, void *arg, void (*handler)(ul irq_num, ul parameter
irq_desc_t *p = &interrupt_desc[irq_num - 32]; irq_desc_t *p = &interrupt_desc[irq_num - 32];
p->controller = controller; p->controller = controller;
p->irq_name = irq_name;
int namelen = sizeof(strlen(irq_name)+1);
p->irq_name = (char *)kmalloc(namelen,0);
memset(p->irq_name, 0, namelen);
strncpy(p->irq_name, irq_name, namelen);
p->parameter = paramater; p->parameter = paramater;
p->flags = 0; p->flags = 0;
p->handler = handler; p->handler = handler;
@ -190,6 +194,7 @@ int irq_unregister(ul irq_num)
p->controller->uninstall(irq_num); p->controller->uninstall(irq_num);
p->controller = NULL; p->controller = NULL;
kfree(p->irq_name);
p->irq_name = NULL; p->irq_name = NULL;
p->parameter = NULL; p->parameter = NULL;
p->flags = 0; p->flags = 0;
@ -210,6 +215,5 @@ void irq_init()
memset((void *)interrupt_desc, 0, sizeof(irq_desc_t) * IRQ_NUM); memset((void *)interrupt_desc, 0, sizeof(irq_desc_t) * IRQ_NUM);
apic_init(); apic_init();
#endif #endif
} }