fix(libcpu): validate arm irq vectors before masking

7 files changed, 105 insertions, 0 deletions

diff --git a/libcpu/arm/AT91SAM7S/interrupt.c b/libcpu/arm/AT91SAM7S/interrupt.c
index a34fa50994..6d10af8811 100644
--- a/libcpu/arm/AT91SAM7S/interrupt.c
+++ b/libcpu/arm/AT91SAM7S/interrupt.c
@@ -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;
 }
 
diff --git a/libcpu/arm/AT91SAM7X/interrupt.c b/libcpu/arm/AT91SAM7X/interrupt.c
index 143d8b661b..1a93091f37 100644
--- a/libcpu/arm/AT91SAM7X/interrupt.c
+++ b/libcpu/arm/AT91SAM7X/interrupt.c
@@ -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;
 }
 
diff --git a/libcpu/arm/lpc214x/cpuport.c b/libcpu/arm/lpc214x/cpuport.c
index cbaa761b63..2a1a2d7dad 100644
--- a/libcpu/arm/lpc214x/cpuport.c
+++ b/libcpu/arm/lpc214x/cpuport.c
@@ -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);
 }
 
diff --git a/libcpu/arm/lpc24xx/interrupt.c b/libcpu/arm/lpc24xx/interrupt.c
index a8b8199ee6..ccbe35c103 100644
--- a/libcpu/arm/lpc24xx/interrupt.c
+++ b/libcpu/arm/lpc24xx/interrupt.c
@@ -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);
 }
 
diff --git a/libcpu/arm/s3c24x0/interrupt.c b/libcpu/arm/s3c24x0/interrupt.c
index 530b984809..8b591f4232 100644
--- a/libcpu/arm/s3c24x0/interrupt.c
+++ b/libcpu/arm/s3c24x0/interrupt.c
@@ -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);
diff --git a/libcpu/arm/s3c44b0/interrupt.c b/libcpu/arm/s3c44b0/interrupt.c
index 44cef7f9c0..9b896e4866 100644
--- a/libcpu/arm/s3c44b0/interrupt.c
+++ b/libcpu/arm/s3c44b0/interrupt.c
@@ -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);
 }
 
diff --git a/libcpu/arm/sep4020/interrupt.c b/libcpu/arm/sep4020/interrupt.c
index b32bccf4ee..79f98f511d 100644
--- a/libcpu/arm/sep4020/interrupt.c
+++ b/libcpu/arm/sep4020/interrupt.c
@@ -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);