Fixed MADT iteration infinity loop

bagggage · Sep 28, 2024 · 05d2f23 · 05d2f23
1 parent 31ae5d0
commit 05d2f23
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/kernel/arch/x86-64/intr/apic.zig b/src/kernel/arch/x86-64/intr/apic.zig
@@ -65,6 +65,9 @@ pub const Madt = extern struct {
 
         while (@intFromPtr(entry) < end_addr)
         : (entry = @ptrFromInt(@intFromPtr(entry) + entry.length)) {
+            // Don`t trust hardware, avoid infinity loop
+            if (entry.length == 0) break;
+
             if (entry.type == ent_type) return entry;
         }
 
@@ -105,7 +108,7 @@ pub inline fn getMadt() *Madt {
 }
 
 inline fn isAvail() bool {
-    return (arch.cpuid(arch.cpuid_features).d & c.bit_APIC) != 0;
+    return (arch.cpuid(arch.cpuid_features, undefined, undefined, undefined).d & c.bit_APIC) != 0;
 }
 
 fn bindIrq(irq: *const intr.Irq) void {