xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / arm / data.s

diff --git a/osfmk/arm/data.s b/osfmk/arm/data.s
index 917e68c2f5ad54e9f4b88c0f8314cc27ebc537ad..812ea77a48730c52a4276dda820e44629711ce9c 100644 (file)
--- a/osfmk/arm/data.s
+++ b/osfmk/arm/data.s
@@ -106,14 +106,24 @@ LEXT(vfptrash_data)
 #if __arm64__
         .section __DATA, __const
 
-#if defined(KERNEL_INTEGRITY_KTRR)
+#if defined(KERNEL_INTEGRITY_KTRR) || defined(KERNEL_INTEGRITY_CTRR)
 /* reserve space for read only page tables */
         .align 14
 LEXT(ropagetable_begin)
+#if XNU_TARGET_OS_OSX
+               // A big auxKC might need more page tables, especially because
+           // it's not block mapped.
+           // Note that we don't distuinguish between KASAN or not: With
+           // a KASAN kernel, the effective auxKC limit is smaller.
+               .space 18*16*1024,0
+#elif KASAN
+        .space 16*16*1024,0
+#else
         .space 14*16*1024,0
+#endif
 #else
 LEXT(ropagetable_begin)
-#endif /* defined(KERNEL_INTEGRITY_KTRR)*/
+#endif /* defined(KERNEL_INTEGRITY_KTRR) || defined(KERNEL_INTEGRITY_CTRR) */
 
 LEXT(ropagetable_end)