Improved HS support

Piker-Alpha · Jul 31, 2017 · eb53c9a · eb53c9a
1 parent ad921df
commit eb53c9a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 14 deletions.
diff --git a/i386/libsaio/bootstruct.c b/i386/libsaio/bootstruct.c
@@ -127,12 +127,15 @@ void initKernelBootConfig(void)
 
 #endif // #if ((MAKE_TARGET_OS & MOUNTAIN_LION) == MOUNTAIN_LION)
 
-#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan and Sierra
+#if ((MAKE_TARGET_OS & EL_CAPITAN) == EL_CAPITAN) // El Capitan, Sierra and High Sierra.
+	// csr_init()							checks for: kBootArgsFlagCSRActiveConfig and kBootArgsFlagCSRConfigMode
+	// csr_get_active_config()				checks for: kBootArgsFlagCSRActiveConfig
+	// csr_check(csr_config_t mask)			checks for: kBootArgsFlagCSRConfigMode
 	bootArgs->flags							|= (kBootArgsFlagCSRActiveConfig + kBootArgsFlagCSRConfigMode + kBootArgsFlagCSRBoot + kBootArgsFlagInstallUI);
 
-	bootArgs->csrActiveConfig				= CSR_ALLOW_DEVICE_CONFIGURATION;
+	bootArgs->csrActiveConfig				= CSR_ALWAYS_ENFORCED_FLAGS;
 
-	bootArgs->csrCapabilities				= CSR_VALID_FLAGS; // CSR_CAPABILITY_UNLIMITED;
+	bootArgs->csrCapabilities				= CSR_VALID_CAPABILITIES;
 
 	bootArgs->boot_SMC_plimit				= 0;
 

diff --git a/i386/libsaio/bootstruct.h b/i386/libsaio/bootstruct.h
@@ -26,6 +26,7 @@
  *			- Yosemite support added (Pike R. Alpha, June 2014).
  *			- El Capitan support added (Pike R. Alpha, June 2015).
  *			- Sierra support added (Pike R. Alpha, August 2016).
+ *			- High Sierra support added (Pike R. Alpha, June 2017).
  */
 
 #ifndef __BOOTSTRUCT_H
@@ -111,8 +112,12 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 	#define kBootArgsFlagInstallUI			(1 << 8)	// 256
 #endif
 
+#ifndef kBootArgsFlagUnknownHS
+	#define kBootArgsFlagUnknownHS			(1 << 9)	// 512 (High Sierra only)
+#endif
+
+/* SIP (System Integrity Protection) booter configuration flags */
 #ifndef CSR_VALID_FLAGS
-	/* Rootless configuration flags */
 	#define CSR_ALLOW_UNTRUSTED_KEXTS		(1 << 0)	// 1
 	#define CSR_ALLOW_UNRESTRICTED_FS		(1 << 1)	// 2
 	#define CSR_ALLOW_TASK_FOR_PID			(1 << 2)	// 4
@@ -122,18 +127,35 @@ typedef struct Boot_Video_V2	Boot_Video_V2;
 	#define CSR_ALLOW_UNRESTRICTED_NVRAM	(1 << 6)	// 64
 	#define CSR_ALLOW_DEVICE_CONFIGURATION	(1 << 7)	// 128
 	#define CSR_ALLOW_ANY_RECOVERY_OS		(1 << 8)	// 256
-
-	#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
-			CSR_ALLOW_UNRESTRICTED_FS | \
-			CSR_ALLOW_TASK_FOR_PID | \
-			CSR_ALLOW_KERNEL_DEBUGGER | \
-			CSR_ALLOW_APPLE_INTERNAL | \
-			CSR_ALLOW_UNRESTRICTED_DTRACE | \
-			CSR_ALLOW_UNRESTRICTED_NVRAM | \
-			CSR_ALLOW_DEVICE_CONFIGURATION | \
-			CSR_ALLOW_ANY_RECOVERY_OS)
+	#define CSR_ALLOW_UNKNOWN_HS			(1 << 9)	// 512 (High Sierra only)
+
+	#if ((MAKE_TARGET_OS & HIGH_SIERRA) == HIGH_SIERRA)
+		#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
+				CSR_ALLOW_UNRESTRICTED_FS | \
+				CSR_ALLOW_TASK_FOR_PID | \
+				CSR_ALLOW_KERNEL_DEBUGGER | \
+				CSR_ALLOW_APPLE_INTERNAL | \
+				CSR_ALLOW_UNRESTRICTED_DTRACE | \
+				CSR_ALLOW_UNRESTRICTED_NVRAM | \
+				CSR_ALLOW_DEVICE_CONFIGURATION | \
+				CSR_ALLOW_ANY_RECOVERY_OS | \
+				CSR_ALLOW_UNKNOWN_HS)
+	#else
+		#define CSR_VALID_FLAGS (CSR_ALLOW_UNTRUSTED_KEXTS | \
+				CSR_ALLOW_UNRESTRICTED_FS | \
+				CSR_ALLOW_TASK_FOR_PID | \
+				CSR_ALLOW_KERNEL_DEBUGGER | \
+				CSR_ALLOW_APPLE_INTERNAL | \
+				CSR_ALLOW_UNRESTRICTED_DTRACE | \
+				CSR_ALLOW_UNRESTRICTED_NVRAM | \
+				CSR_ALLOW_DEVICE_CONFIGURATION | \
+				CSR_ALLOW_ANY_RECOVERY_OS)
+	#endif
 #endif
 
+/* Used in csr_check(csr_config_t mask) */
+#define CSR_ALWAYS_ENFORCED_FLAGS (CSR_ALLOW_DEVICE_CONFIGURATION | CSR_ALLOW_ANY_RECOVERY_OS)
+
 /* CSR capabilities that a booter can give to the system */
 #define CSR_CAPABILITY_UNLIMITED				(1 << 0)
 #define CSR_CAPABILITY_CONFIG					(1 << 1)