xnu-7195.60.75.tar.gz

[apple/xnu.git] / osfmk / arm64 / status.c

diff --git a/osfmk/arm64/status.c b/osfmk/arm64/status.c
index 221a2e1c01748a84a56fde48d73f0d43d7aa0dc0..c1a77bf66e4b914eec30d15e42b7ebb32cf95b9d 100644 (file)
--- a/osfmk/arm64/status.c
+++ b/osfmk/arm64/status.c
@@ -320,8 +320,8 @@ machine_thread_state_convert_to_user(
 
        // Note that kernel threads never have disable_user_jop set
        if (current_thread()->machine.disable_user_jop || !thread_is_64bit_addr(current_thread()) ||
 
        // Note that kernel threads never have disable_user_jop set
        if (current_thread()->machine.disable_user_jop || !thread_is_64bit_addr(current_thread()) ||

-           thread->machine.disable_user_jop || !thread_is_64bit_addr(thread) ||
-           (BootArgs->bootFlags & kBootFlagsDisableUserThreadStateJOP)) {
+           thread->machine.disable_user_jop || !thread_is_64bit_addr(thread)
+           ) {

                ts64->flags = __DARWIN_ARM_THREAD_STATE64_FLAGS_NO_PTRAUTH;
                return KERN_SUCCESS;
        }
                ts64->flags = __DARWIN_ARM_THREAD_STATE64_FLAGS_NO_PTRAUTH;
                return KERN_SUCCESS;
        }


@@ -420,8 +420,8 @@ machine_thread_state_convert_from_user(
        }
 
        if (ts64->flags & __DARWIN_ARM_THREAD_STATE64_FLAGS_NO_PTRAUTH) {
        }
 
        if (ts64->flags & __DARWIN_ARM_THREAD_STATE64_FLAGS_NO_PTRAUTH) {

-               if (thread->machine.disable_user_jop || !thread_is_64bit_addr(thread) ||
-                   (BootArgs->bootFlags & kBootFlagsDisableUserThreadStateJOP)) {
+               if (thread->machine.disable_user_jop || !thread_is_64bit_addr(thread)
+                   ) {

                        return KERN_SUCCESS;
                }
                // Disallow setting unsigned thread state on JOP-enabled processes.
                        return KERN_SUCCESS;
                }
                // Disallow setting unsigned thread state on JOP-enabled processes.