From 65430cd09f3b6162187d66d66f860e8883f8ff9b Mon Sep 17 00:00:00 2001
From: Ada Christine <adachristine18@gmail.com>
Date: Wed, 2 Feb 2022 10:51:18 +0000
Subject: cast with uintptr_t, ist index should be checked

---
 kc/core/cpu/cpu.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'kc')

diff --git a/kc/core/cpu/cpu.c b/kc/core/cpu/cpu.c
index 49a88be..27ee827 100644
--- a/kc/core/cpu/cpu.c
+++ b/kc/core/cpu/cpu.c
@@ -270,16 +270,21 @@ void isr_install(int vec, void (*isr)(void), int trap, int ist)
         type = TRAP64_GATE;
     }
 
-    set_idt(vec, CODE_SUPER_SEG_INDEX << 3, (uint64_t)isr, type);
-    if (ist)
+    set_idt(vec, CODE_SUPER_SEG_INDEX << 3, (uintptr_t)isr, type);
+    // an IST greater than 7 is invalid 
+    if (ist && ist < 7)
     {
         set_ist(vec, ist);
     }
+    else
+    {
+        panic(GENERAL_PANIC);
+    }
 }
 
 void ist_install(int ist, void *stack)
 {
-    tss.ist[ist] = (uint64_t)stack;
+    tss.ist[ist] = (uintptr_t)stack;
 }
 
 void int_enable(void)
-- 
cgit v1.3.1-1-g115d