diff options
| author | AFWEF_147 <[email protected]> | 2026-03-26 13:55:23 +0000 |
|---|---|---|
| committer | Rbb666 <[email protected]> | 2026-04-07 10:08:17 +0800 |
| commit | dedff58dd303498516a60953482991be745d0b30 (patch) | |
| tree | f9273315f3b2e87d523d443a9db2e8b0c4b29f57 /libcpu/ia32 | |
| parent | 21d223f08986e3252eb0e8ff4510efe0e0e3877c (diff) | |
fix(libcpu): validate ia32 pic irq vectors
Diffstat (limited to 'libcpu/ia32')
| -rw-r--r-- | libcpu/ia32/interrupt.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/libcpu/ia32/interrupt.c b/libcpu/ia32/interrupt.c index b73c146c29..8325ca0619 100644 --- a/libcpu/ia32/interrupt.c +++ b/libcpu/ia32/interrupt.c @@ -20,6 +20,11 @@ struct rt_irq_desc irq_desc[MAX_HANDLERS]; rt_uint16_t irq_mask_8259A = 0xFFFF; +rt_inline rt_bool_t _interrupt_vector_is_valid(int vector) +{ + return (vector >= 0) && (vector < MAX_HANDLERS); +} + void rt_hw_interrupt_handle(int vector, void* param); /** @@ -92,14 +97,24 @@ void rt_hw_interrupt_init(void) void rt_hw_interrupt_umask(int vector) { - irq_mask_8259A = irq_mask_8259A&~(1<<vector); + if (!_interrupt_vector_is_valid(vector)) + { + return; + } + + irq_mask_8259A = irq_mask_8259A & ~(rt_uint16_t)(1U << vector); outb(IO_PIC1+1, (char)irq_mask_8259A); outb(IO_PIC2+1, (char)(irq_mask_8259A >> 8)); } void rt_hw_interrupt_mask(int vector) { - irq_mask_8259A = irq_mask_8259A | (1<<vector); + if (!_interrupt_vector_is_valid(vector)) + { + return; + } + + irq_mask_8259A = irq_mask_8259A | (rt_uint16_t)(1U << vector); outb(IO_PIC1+1, (char)irq_mask_8259A); outb(IO_PIC2+1, (char)(irq_mask_8259A >> 8)); } |
