1 files changed, 41 insertions, 0 deletions

diff --git a/rsnix/src/interrupts.rs b/rsnix/src/interrupts.rs
index be252df..927e4f1 100644
--- a/rsnix/src/interrupts.rs
+++ b/rsnix/src/interrupts.rs
@@ -393,6 +393,38 @@ pub(crate) struct IntFrame {
     pub(crate) ss: u64,
 }
 
+// ---------------------------------------------------------------------------
+// Fault-dump re-entry guard
+// ---------------------------------------------------------------------------
+
+/// Set when `sched::fault_dump` is running.  Any CPU exception that
+/// fires *while the dump is already in progress* (typically because the
+/// heap is corrupted and the dump path tripped over it) must never
+/// recurse into the dump — that chain (#PF → #DF → #PF) is a triple
+/// fault, which silently resets the machine with no report (black
+/// screen, firmware splash — exactly what real hardware showed).  The
+/// guard short-circuits to a raw heap-free band and a hard halt.
+static mut IN_DUMP: bool = false;
+
+pub fn enter_dump() {
+    unsafe {
+        IN_DUMP = true;
+    }
+}
+
+fn in_dump() -> bool {
+    unsafe { IN_DUMP }
+}
+
+/// Raw, heap-free fallback: a fault fired inside the fault dump.
+fn dump_guard_halt() -> ! {
+    crate::gop::dump_lines(&[
+        "!!! fault inside fault dump",
+        "!!! halting (no triple fault)",
+    ]);
+    halt();
+}
+
 /// Called from the asm common handler — dispatches to the right Rust
 /// handler and returns the frame pointer the asm should switch to (the
 /// next task's, or the same one when no switch happens).
@@ -433,9 +465,15 @@ unsafe extern "C" fn isr_dispatch(frame: &IntFrame) -> usize {
             8 => {
                 // Double fault — dump the frame (we're on the IST stack
                 // so this is safe) and halt.
+                if in_dump() {
+                    dump_guard_halt();
+                }
                 crate::sched::fault_dump("double fault", 0, frame)
             }
             14 => {
+                if in_dump() {
+                    dump_guard_halt();
+                }
                 let cr2: u64;
                 core::arch::asm!("mov {}, cr2", out(reg) cr2,
                     options(nostack, preserves_flags));
@@ -445,6 +483,9 @@ unsafe extern "C" fn isr_dispatch(frame: &IntFrame) -> usize {
             v if v < 32 => {
                 // Any other CPU exception: full dump (screen + serial),
                 // then halt the shell or abort the faulting background task.
+                if in_dump() {
+                    dump_guard_halt();
+                }
                 crate::sched::fault_dump("exception", 0, frame)
             }
             _ => fp,