xnu-4570.61.1.tar.gz

[apple/xnu.git] / osfmk / arm64 / locore.s

diff --git a/osfmk/arm64/locore.s b/osfmk/arm64/locore.s
index 4430d3b5ce0593bbfdaea9ea49d280cdc5a0b3f7..376e901953de96617b5c0af84383c22d06614f73 100644 (file)
--- a/osfmk/arm64/locore.s
+++ b/osfmk/arm64/locore.s
@@ -400,6 +400,7 @@ Lel1_sp1_serror_vector_long:
        b               fleh_dispatch64
 
 .macro EL0_64_VECTOR
        b               fleh_dispatch64
 
 .macro EL0_64_VECTOR

+       mov             x18, xzr                                                // Zero x18 to avoid leaking data to user SS

        stp             x0, x1, [sp, #-16]!                                     // Save x0 and x1 to the exception stack
        mrs             x0, TPIDR_EL1                                           // Load the thread register
        mrs             x1, SP_EL0                                                      // Load the user stack pointer
        stp             x0, x1, [sp, #-16]!                                     // Save x0 and x1 to the exception stack
        mrs             x0, TPIDR_EL1                                           // Load the thread register
        mrs             x1, SP_EL0                                                      // Load the user stack pointer