bazel: Fix bitrotted migration for injector and IOUserClient for Darw…

…inKit
YungRaj · Dec 14, 2024 · 6c2f2d0 · 6c2f2d0
1 parent 554740c
commit 6c2f2d0
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 49 deletions.
diff --git a/BUILD b/BUILD
@@ -29,7 +29,7 @@ genrule(
         cd ..
         cp capstone/libcapstone.a libcapstone_x86_64_universal.a
         cd capstone
-        export ARCH=arm64
+        export ARCH=arm64e
         export CFLAGS="-target $$ARCH-apple-macos"
         export CXXFLAGS="-target $$ARCH-apple-macos"
         export LDFLAGS="-target $$ARCH-apple-macos"
@@ -126,7 +126,7 @@ cc_library(
            glob(["darwinkit/*.cc"]) +
            glob(["arm64/*.s"]) +
            glob(["arm64/*.cc"]) +
-            glob(["x86_64/*.cc"]),
+           glob(["x86_64/*.cc"]),
     hdrs = glob(["user/*.h"]) + glob(["darwinkit/*.h"]) + glob(["arm64/*.h"]) + glob(["x86_64/*.h"]) + glob(["capstone/include/capstone/*.h"]),
     includes = [
         "user",

diff --git a/kernel/kernel.cc b/kernel/kernel.cc
@@ -82,23 +82,23 @@ UInt8 Kernel::tempExecutableMemory[tempExecutableMemorySize]
 Kernel* Kernel::kernel = nullptr;
 
 Kernel* Kernel::Create(xnu::mach::Port kernel_task_port) {
-    if (!kernel)
+    if (!kernel) {
         kernel = new Kernel(kernel_task_port);
-
+    }
     return kernel;
 }
 
 Kernel* Kernel::Create(xnu::mach::VmAddress cache, xnu::mach::VmAddress base, Offset slide) {
-    if (!kernel)
+    if (!kernel) {
         kernel = new Kernel(cache, base, slide);
-
+    }
     return kernel;
 }
 
 Kernel* Kernel::Create(xnu::mach::VmAddress base, Offset slide) {
-    if (!kernel)
+    if (!kernel) {
         kernel = new Kernel(base, slide);
-
+    }
     return kernel;
 }
 

diff --git a/kernel/kernel_darwin_kit.cc b/kernel/kernel_darwin_kit.cc
@@ -30,7 +30,7 @@ static bool loaded = false;
 
 OSDefineMetaClassAndStructors(IOKernelDarwinKitService, IOService)
 
-    bool IOKernelDarwinKitService::init(OSDictionary* properties) {
+bool IOKernelDarwinKitService::init(OSDictionary* properties) {
     userClients = OSSet::withCapacity(1);
 
     if (!userClients)
@@ -137,7 +137,7 @@ IOReturn IOKernelDarwinKitService::createUserClient(task_t task, void* securityI
 
     IOKernelDarwinKitUserClient* userClient;
 
-    userClient = IOKernelDarwinKitUserClient::rootKitUserClientWithKernel(kernel, task,
+    userClient = IOKernelDarwinKitUserClient::darwinKitUserClientWithKernel(kernel, task,
                                                                         securityID, type);
 
     if (userClient)
@@ -155,7 +155,7 @@ IOReturn IOKernelDarwinKitService::createUserClient(task_t task, void* securityI
 
     IOKernelDarwinKitUserClient* userClient;
 
-    userClient = IOKernelDarwinKitUserClient::rootKitUserClientWithKernel(
+    userClient = IOKernelDarwinKitUserClient::darwinKitUserClientWithKernel(
         kernel, task, securityID, type, properties);
 
     if (userClient)

diff --git a/kernel/kernel_darwin_kit.h b/kernel/kernel_darwin_kit.h
@@ -42,8 +42,8 @@ extern darwin::DarwinKit* darwinkit_get_darwinkit();
 
 class IOKernelDarwinKitService : public IOService {
     OSDeclareDefaultStructors(IOKernelDarwinKitService)
-
-        public : virtual bool init(OSDictionary* properties) override;
+public:   
+    virtual bool init(OSDictionary* properties) override;
 
     virtual void free() override;
 

diff --git a/kernel/kernel_darwin_kit_user_client.cc b/kernel/kernel_darwin_kit_user_client.cc
@@ -37,7 +37,7 @@ extern "C" {
 
 OSDefineMetaClassAndStructors(IOKernelDarwinKitUserClient, IOUserClient)
 
-IOKernelDarwinKitUserClient* IOKernelDarwinKitUserClient::rootKitUserClientWithKernel(
+IOKernelDarwinKitUserClient* IOKernelDarwinKitUserClient::darwinKitUserClientWithKernel(
         xnu::Kernel* kernel, task_t owningTask, void* securityToken, UInt32 type) {
     IOKernelDarwinKitUserClient* client;
 
@@ -54,7 +54,7 @@ IOKernelDarwinKitUserClient* IOKernelDarwinKitUserClient::rootKitUserClientWithK
     return client;
 }
 
-IOKernelDarwinKitUserClient* IOKernelDarwinKitUserClient::rootKitUserClientWithKernel(
+IOKernelDarwinKitUserClient* IOKernelDarwinKitUserClient::darwinKitUserClientWithKernel(
     xnu::Kernel* kernel, task_t owningTask, void* securityToken, UInt32 type,
     OSDictionary* properties) {
     IOKernelDarwinKitUserClient* client;
@@ -73,32 +73,34 @@ IOKernelDarwinKitUserClient* IOKernelDarwinKitUserClient::rootKitUserClientWithK
     return client;
 }
 
-bool IOKernelDarwinKitUserClient::initDarwinKitUserClientWithKernel(xnu::Kernel* kernel,
+bool IOKernelDarwinKitUserClient::initDarwinKitUserClientWithKernel(xnu::Kernel* kern,
                                                                 task_t owningTask,
                                                                 void* securityToken, UInt32 type) {
     bool result = IOUserClient::initWithTask(owningTask, securityToken, type);
 
-    if (!kernel)
-        result = false;
+    kernel = kern;
 
-    kernel = kernel;
+    if (!kernel) {
+        result = false;
+    }
 
     clientTask = owningTask;
     kernelTask = *(task_t*)kernel->GetSymbolAddressByName("_kernel_task");
 
     return result;
 }
 
-bool IOKernelDarwinKitUserClient::initDarwinKitUserClientWithKernel(xnu::Kernel* kernel,
+bool IOKernelDarwinKitUserClient::initDarwinKitUserClientWithKernel(xnu::Kernel* kern,
                                                                 task_t owningTask,
                                                                 void* securityToken, UInt32 type,
                                                                 OSDictionary* properties) {
     bool result = IOUserClient::initWithTask(owningTask, securityToken, type, properties);
 
-    if (!kernel)
-        result = false;
+    kernel = kern;
 
-    kernel = kernel;
+    if (!kernel) {
+        result = false;
+    }
 
     clientTask = owningTask;
     kernelTask = *(task_t*)kernel->GetSymbolAddressByName("_kernel_task");

diff --git a/kernel/kernel_darwin_kit_user_client.h b/kernel/kernel_darwin_kit_user_client.h
@@ -42,20 +42,20 @@ class IOKernelDarwinKitService;
 class IOKernelDarwinKitUserClient : public IOUserClient {
     OSDeclareDefaultStructors(IOKernelDarwinKitUserClient)
  public:
-    static IOKernelDarwinKitUserClient* rootKitUserClientWithKernel(xnu::Kernel* kernel,
+    static IOKernelDarwinKitUserClient* darwinKitUserClientWithKernel(xnu::Kernel* kern,
                                                                                task_t owningTask,
                                                                                void* securityToken,
                                                                                UInt32 type);
 
-    static IOKernelDarwinKitUserClient* rootKitUserClientWithKernel(xnu::Kernel* kernel,
+    static IOKernelDarwinKitUserClient* darwinKitUserClientWithKernel(xnu::Kernel* kern,
                                                                   task_t owningTask,
                                                                   void* securityToken, UInt32 type,
                                                                   OSDictionary* properties);
 
-    virtual bool initDarwinKitUserClientWithKernel(xnu::Kernel* kernel, task_t owningTask,
+    virtual bool initDarwinKitUserClientWithKernel(xnu::Kernel* kern, task_t owningTask,
                                                  void* securityToken, UInt32 type);
 
-    virtual bool initDarwinKitUserClientWithKernel(xnu::Kernel* kernel, task_t owningTask,
+    virtual bool initDarwinKitUserClientWithKernel(xnu::Kernel* kern, task_t owningTask,
                                                  void* securityToken, UInt32 type,
                                                  OSDictionary* properties);
 

diff --git a/kernel/task.h b/kernel/task.h
@@ -92,20 +92,20 @@ class Task {
         return pid;
     }
 
-    void SetTask(task_t task) {
-        task = task;
+    void SetTask(task_t tsk) {
+        task = tsk;
     }
 
-    void SetMap(vm_map_t map) {
-        map = map;
+    void SetMap(vm_map_t vm_map) {
+        map = vm_map;
     }
 
-    void SetPmap(pmap_t pmap) {
-        pmap = pmap;
+    void SetPmap(pmap_t p_map) {
+        pmap = p_map;
     }
 
-    void SetProc(proc_t proc) {
-        proc = proc;
+    void SetProc(proc_t p) {
+        proc = p;
     }
 
     virtual xnu::mach::VmAddress GetBase() {
@@ -116,12 +116,12 @@ class Task {
         return slide;
     }
 
-    void SetBase(xnu::mach::VmAddress base) {
-        base = base;
+    void SetBase(xnu::mach::VmAddress bse) {
+        base = bse;
     }
 
-    void SetSlide(Offset slide) {
-        slide = slide;
+    void SetSlide(Offset s) {
+        slide = s;
     }
 
     virtual UInt64 Call(char* symbolname, UInt64* arguments, Size argCount);

diff --git a/user/kern_user.c b/user/kern_user.c
@@ -46,14 +46,17 @@ mach_port_t open_kernel_tfp0_connection()
 
 		IOObjectRelease(service);
 
-		if(kr == KERN_SUCCESS)
+		if(kr == KERN_SUCCESS) {
 			break;
+		}
 
 		IOServiceClose(connection);
 	}
 
-	if(kr != KERN_SUCCESS)
+	if(kr != KERN_SUCCESS) {
+		printf("Open IOService %s failed! %s\n", service_name, mach_error_string(kr));
 		return MACH_PORT_NULL;
+	}
 
 	connection = conn;
 
@@ -140,7 +143,7 @@ mach_vm_address_t get_kernel_base()
 
 	if(kr != KERN_SUCCESS)
 	{
-		printf("get_kernel_base failed!\n");
+		printf("get_kernel_base failed! %s\n", mach_error_string(kr));
 
 		return (mach_vm_address_t) 0;
 	}

diff --git a/user/macho_userspace.h b/user/macho_userspace.h
@@ -146,12 +146,12 @@ class MachOUserspace : public MachO {
         return is_libobjc;
     }
 
-    void SetIsObjectiveCLibrary(bool is_libobjc) {
-        is_libobjc = is_libobjc;
+    void SetIsObjectiveCLibrary(bool objc) {
+        is_libobjc = objc;
     }
 
-    void SetObjectiveCLibrary(MachOUserspace* libobjc) {
-        libobjc = libobjc;
+    void SetObjectiveCLibrary(MachOUserspace* objc) {
+        libobjc = objc;
     }
 
     static MachO* TaskAt(xnu::mach::Port task);

diff --git a/user/main.cc b/user/main.cc
@@ -560,12 +560,9 @@ int main(int argc, char** argv) {
 
     int c;
 
-    /*
-
     kernel = new Kernel();
 
     printf("Kernel base = 0x%llx slide = 0x%llx\n", kernel->GetBase(), kernel->GetSlide());
-    */
 
     /*
     task = new Task(kernel, 614);
-Original file line number
+Diff line change
@@ Expand Up / @@ -560,12 +560,9 @@ int main(int argc, char** argv) { @@
         int c;
-        /*
         kernel = new Kernel();
         printf("Kernel base = 0x%llx slide = 0x%llx\n", kernel->GetBase(), kernel->GetSlide());
-        */
         /*
         task = new Task(kernel, 614);
@@ Expand Down @@