From 7c26a1964d2d2e54f87d9c42735f6c99b546abd4 Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 18 Feb 2015 02:22:36 -0500 Subject: Fix hook-function: - Thread stoppage is now complemented by sigaction to catch injected threads (sigaction is not used exclusively because the rest of the program could be trying to use sigaction itself in the meantime - this is a real thing, ask Dolphin) - mprotect is no longer used due to max_protection possibly getting in the way; instead, a copy is created and mapped onto the original. --- test/test-pc-patch.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 test/test-pc-patch.c (limited to 'test/test-pc-patch.c') diff --git a/test/test-pc-patch.c b/test/test-pc-patch.c new file mode 100644 index 0000000..5ae3570 --- /dev/null +++ b/test/test-pc-patch.c @@ -0,0 +1,50 @@ +#include "substitute-internal.h" +#include "execmem.h" +#include +#include +#include +#include +#include +/* printf without taking any locks - because they might be taken at stop time */ +#define ulprintf(...) do { \ + char buf[256]; \ + int len = sprintf(buf, __VA_ARGS__); \ + write(1, buf, len); \ +} while(0) + +static void *some_thread(void *ip) { + long i = (long) ip; + while (1) { + ulprintf("Hello from %ld\n", i); + sleep(1); + } +} +static void replacement() { + ulprintf("Bye\n"); + pthread_exit(NULL); +} +static uintptr_t patch_callback(void *ctx, UNUSED uintptr_t pc) { + assert(!ctx); + return (uintptr_t) replacement; +} + +int main() { + pthread_t pts[10]; + for (long i = 0; i < 10; i++) + pthread_create(&pts[i], NULL, some_thread, (void *) i); + sleep(1); + char *foo = malloc(0x10000); + static char bar[16]; + struct execmem_foreign_write writes[] = { + {foo, bar, 5}, + {foo + 7, bar + 7, 3}, + }; + int ret = execmem_foreign_write_with_pc_patch(writes, + sizeof(writes)/sizeof(*writes), + patch_callback, + NULL); + ulprintf("==> %d\n", ret); + void *out; + for (long i = 0; i < 10; i++) + assert(!pthread_join(pts[i], &out)); +} -- cgit v1.2.3