X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/d336c0247563c5a1a95fb205386945fc76251e7e..38ae783db781810a19b3103bb55c81ea70e7d952:/Mach/Inject.cpp
diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index ec1f1f5..a6dcf9f 100644
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -1,20 +1,20 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010 Jay Freeman (saurik)
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
*
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with Cycript. If not, see .
**/
/* }}} */
@@ -22,7 +22,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -33,8 +33,6 @@
#include "Pooling.hpp"
#include "Trampoline.t.hpp"
-extern "C" void __pthread_set_self(pthread_t);
-
void InjectLibrary(pid_t pid) {
const char *library(CY_LIBRARY);
@@ -43,104 +41,114 @@ void InjectLibrary(pid_t pid) {
depth = (depth + sizeof(uintptr_t) + 1) / sizeof(uintptr_t) * sizeof(uintptr_t);
CYPool pool;
- uint8_t *local(reinterpret_cast(apr_palloc(pool, depth)));
+ uint8_t *local(pool.malloc(depth));
Baton *baton(reinterpret_cast(local));
- baton->__pthread_set_self = &__pthread_set_self;
-
- baton->dlerror = &dlerror;
- baton->dlsym = &dlsym;
-
baton->pid = getpid();
memcpy(baton->library, library, length);
- vm_size_t size(depth + Stack_);
-
mach_port_t self(mach_task_self()), task;
_krncall(task_for_pid(self, pid, &task));
+ mach_msg_type_number_t count;
+
+ task_dyld_info info;
+ count = TASK_DYLD_INFO_COUNT;
+ _krncall(task_info(task, TASK_DYLD_INFO, reinterpret_cast(&info), &count));
+ _assert(count == TASK_DYLD_INFO_COUNT);
+ _assert(info.all_image_info_addr != 0);
+ baton->dyld = info.all_image_info_addr;
+
+ vm_size_t size(depth + Stack_);
vm_address_t stack;
_krncall(vm_allocate(task, &stack, size, true));
- vm_address_t data(stack + Stack_);
- vm_write(task, data, reinterpret_cast(baton), depth);
+ vm_address_t data(stack + Stack_);
+ _krncall(vm_write(task, data, reinterpret_cast(baton), depth));
thread_act_t thread;
_krncall(thread_create(task, &thread));
thread_state_flavor_t flavor;
- mach_msg_type_number_t count;
- size_t push;
-
- Trampoline *trampoline;
-
-#if defined(__arm__)
- trampoline = &Trampoline_arm_;
+#if defined (__i386__) || defined(__x86_64__)
+ x86_thread_state_t state;
+ flavor = x86_THREAD_STATE;
+ count = x86_THREAD_STATE_COUNT;
+#elif defined(__arm__)
arm_thread_state_t state;
flavor = ARM_THREAD_STATE;
count = ARM_THREAD_STATE_COUNT;
+#else
+ #error XXX: implement
+#endif
+
+ memset(&state, 0, sizeof(state));
+ mach_msg_type_number_t read(count);
+ _krncall(thread_get_state(thread, flavor, reinterpret_cast(&state), &read));
+ _assert(read == count);
+
+ Trampoline *trampoline;
+ size_t push;
+
+#if defined(__i386__) || defined(__x86_64__)
+ switch (state.tsh.flavor) {
+ case i386_THREAD_STATE:
+ trampoline = &Trampoline_i386_;
+ push = 5;
+ break;
+ case x86_THREAD_STATE64:
+ trampoline = &Trampoline_x86_64_;
+ push = 2;
+ break;
+ default:
+ _assert(false);
+ }
+#elif defined(__arm__)
+ trampoline = &Trampoline_armv6_;
push = 0;
-#elif defined(__i386__)
- trampoline = &Trampoline_i386_;
- i386_thread_state_t state;
- flavor = i386_THREAD_STATE;
- count = i386_THREAD_STATE_COUNT;
- push = 5;
-#elif defined(__x86_64__)
- trampoline = &Trampoline_x86_64_;
- x86_thread_state64_t state;
- flavor = x86_THREAD_STATE64;
- count = x86_THREAD_STATE64_COUNT;
- push = 2;
#else
#error XXX: implement
#endif
vm_address_t code;
_krncall(vm_allocate(task, &code, trampoline->size_, true));
- vm_write(task, code, reinterpret_cast(trampoline->data_), trampoline->size_);
+ _krncall(vm_write(task, code, reinterpret_cast(trampoline->data_), trampoline->size_));
_krncall(vm_protect(task, code, trampoline->size_, false, VM_PROT_READ | VM_PROT_EXECUTE));
- /*
- printf("_ptss:%p\n", baton->__pthread_set_self);
- printf("dlsym:%p\n", baton->dlsym);
- printf("code:%zx\n", (size_t) code);
- */
-
uint32_t frame[push];
if (sizeof(frame) != 0)
memset(frame, 0, sizeof(frame));
- memset(&state, 0, sizeof(state));
-
- mach_msg_type_number_t read(count);
- _krncall(thread_get_state(thread, flavor, reinterpret_cast(&state), &read));
- _assert(count == count);
-#if defined(__arm__)
- state.r[0] = data;
- state.sp = stack + Stack_;
- state.pc = code + trampoline->entry_;
-
- if ((state.pc & 0x1) != 0) {
- state.pc &= ~0x1;
- state.cpsr |= 0x20;
+#if defined(__i386__) || defined(__x86_64__)
+ switch (state.tsh.flavor) {
+ case i386_THREAD_STATE:
+ frame[1] = data;
+ state.uts.ts32.__eip = code + trampoline->entry_;
+ state.uts.ts32.__esp = stack + Stack_ - sizeof(frame);
+ break;
+ case x86_THREAD_STATE64:
+ state.uts.ts64.__rdi = data;
+ state.uts.ts64.__rip = code + trampoline->entry_;
+ state.uts.ts64.__rsp = stack + Stack_ - sizeof(frame);
+ break;
+ default:
+ _assert(false);
+ }
+#elif defined(__arm__)
+ state.__r[0] = data;
+ state.__pc = code + trampoline->entry_;
+ state.__sp = stack + Stack_ - sizeof(frame);
+
+ if ((state.__pc & 0x1) != 0) {
+ state.__pc &= ~0x1;
+ state.__cpsr |= 0x20;
}
-#elif defined(__i386__)
- frame[1] = data;
-
- state.__eip = code + trampoline->entry_;
- state.__esp = stack + Stack_ - sizeof(frame);
-#elif defined(__x86_64__)
- frame[0] = 0xdeadbeef;
- state.__rdi = data;
- state.__rip = code + trampoline->entry_;
- state.__rsp = stack + Stack_ - sizeof(frame);
#else
#error XXX: implement
#endif
if (sizeof(frame) != 0)
- vm_write(task, stack + Stack_ - sizeof(frame), reinterpret_cast(frame), sizeof(frame));
+ _krncall(vm_write(task, stack + Stack_ - sizeof(frame), reinterpret_cast(frame), sizeof(frame)));
_krncall(thread_set_state(thread, flavor, reinterpret_cast(&state), count));
_krncall(thread_resume(thread));