Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-10-02 14:23:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(libcpu): validate arm irq vectors before masking

Browse Source
This commit is contained in:
AFWEF_147
2026-04-07 10:07:41 +08:00
committed by Rbb666
parent 11a1348ed6
commit 21d223f089
7 changed files with 105 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcpu/arm/AT91SAM7S/interrupt.c
+15
View File
@@ -13,6 +13,11 @@
#define MAX_HANDLERS 32
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
extern rt_atomic_t rt_interrupt_nest;
rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
@@ -53,6 +58,11 @@ void rt_hw_interrupt_init()
*/
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
/* disable interrupt */
AT91C_AIC_IDCR = 1 << vector;
@@ -66,6 +76,11 @@ void rt_hw_interrupt_mask(int vector)
*/
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
AT91C_AIC_IECR = 1 << vector;
}
libcpu/arm/AT91SAM7X/interrupt.c
+15
View File
@@ -15,6 +15,11 @@
#define MAX_HANDLERS 32
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
/* exception and interrupt handler table */
struct rt_irq_desc irq_desc[MAX_HANDLERS];
@@ -65,6 +70,11 @@ void rt_hw_interrupt_init(void)
*/
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
/* disable interrupt */
AT91C_BASE_AIC->AIC_IDCR = 1 << vector;
@@ -78,6 +88,11 @@ void rt_hw_interrupt_mask(int vector)
*/
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
AT91C_BASE_AIC->AIC_IECR = 1 << vector;
}
libcpu/arm/lpc214x/cpuport.c
+15
View File
@@ -16,6 +16,11 @@
#define MAX_HANDLERS 32
#define SVCMODE 0x13
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
extern rt_atomic_t rt_interrupt_nest;
/* exception and interrupt handler table */
@@ -116,6 +121,11 @@ void rt_hw_interrupt_init(void)
*/
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
VICIntEnClr = (1 << vector);
}
@@ -125,6 +135,11 @@ void rt_hw_interrupt_mask(int vector)
*/
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
VICIntEnable = (1 << vector);
}
libcpu/arm/lpc24xx/interrupt.c
+15
View File
@@ -15,6 +15,11 @@
#define MAX_HANDLERS 32
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
/* exception and interrupt handler table */
struct rt_irq_desc irq_desc[MAX_HANDLERS];
@@ -65,11 +70,21 @@ void rt_hw_interrupt_init(void)
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
VICIntEnClr = (1 << vector);
}
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
VICIntEnable = (1 << vector);
}
libcpu/arm/s3c24x0/interrupt.c
+15
View File
@@ -15,6 +15,11 @@
#define MAX_HANDLERS 32
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
extern rt_atomic_t rt_interrupt_nest;
/* exception and interrupt handler table */
@@ -77,6 +82,11 @@ void rt_hw_interrupt_init(void)
*/
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
INTMSK |= 1 << vector;
}
@@ -86,6 +96,11 @@ void rt_hw_interrupt_mask(int vector)
*/
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
if (vector == INTNOTUSED6)
{
rt_kprintf("Interrupt vec %d is not used!\n", vector);
libcpu/arm/s3c44b0/interrupt.c
+15
View File
@@ -15,6 +15,11 @@
#define MAX_HANDLERS 26
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
extern rt_atomic_t rt_interrupt_nest;
/* exception and interrupt handler table */
@@ -114,6 +119,11 @@ void rt_hw_interrupt_init()
*/
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
INTMSK |= 1 << vector;
}
@@ -123,6 +133,11 @@ void rt_hw_interrupt_mask(int vector)
*/
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
INTMSK &= ~(1 << vector);
}
libcpu/arm/sep4020/interrupt.c
+15
View File
@@ -15,6 +15,11 @@
#define MAX_HANDLERS 32
rt_inline rt_bool_t _interrupt_vector_is_valid(int vector)
{
return (vector >= 0) && (vector < MAX_HANDLERS);
}
extern rt_atomic_t rt_interrupt_nest;
/* exception and interrupt handler table */
@@ -82,6 +87,11 @@ void rt_hw_interrupt_init(void)
*/
void rt_hw_interrupt_mask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
*(RP)(INTC_IMR) |= 1 << vector;
}
@@ -91,6 +101,11 @@ void rt_hw_interrupt_mask(int vector)
*/
void rt_hw_interrupt_umask(int vector)
{
if (!_interrupt_vector_is_valid(vector))
{
return;
}
if(vector == 16)
{
rt_kprintf("Interrupt vec %d is not used!\n", vector);