dasharo/subhook
0
0
Fork 0
mirror of https://github.com/Dasharo/subhook.git synced 2026-03-06 15:04:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Small refactoring & cleanup

Browse Source
This commit is contained in:
Zeex
2014-10-04 17:33:01 +07:00
parent 6f864d4877
commit 9e84a215c1
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
subhook_linux.c
View File

@@ -29,7 +29,7 @@
#include <unistd.h>
#include <sys/mman.h>
void *subhook_unprotect(void *address, size_t size) {
void *subhook_unlock(void *address, size_t size) {
intptr_t pagesize;
pagesize = sysconf(_SC_PAGESIZE);

2
subhook_private.h
View File

@@ -33,6 +33,6 @@ struct subhook {
void *dst;
};
void *subhook_unprotect(void *address, size_t size);
void *subhook_unlock(void *address, size_t size);
#endif /* SUBHOOK_PRIVATE_H */

2
subhook_windows.c
View File

@@ -26,7 +26,7 @@
#include <stddef.h>
#include <windows.h>
void *subhook_unprotect(void *address, size_t size) {
void *subhook_unlock(void *address, size_t size) {
DWORD old;
if (VirtualProtect(address, size, PAGE_EXECUTE_READWRITE, &old) == 0)

24
subhook_x86.c
View File

@@ -72,15 +72,21 @@ SUBHOOK_EXPORT int SUBHOOK_API subhook_install(subhook_t hook) {
return -EINVAL;
if (!hook->unlocked) {
subhook_unprotect(hook->src, sizeof(jmp_instr));
hook->unlocked = 1;
subhook_unlock(hook->src, sizeof(jmp_instr));
hook->unlocked = 1;
}
memcpy(((struct subhook_x86 *)hook)->code, hook->src, sizeof(jmp_instr));
memcpy(hook->src, &jmp_instr, sizeof(jmp_instr));
memcpy(((struct subhook_x86 *)hook)->code,
hook->src,
sizeof(jmp_instr));
memcpy(hook->src,
&jmp_instr,
sizeof(jmp_instr));
offset = (intptr_t)hook->dst - ((intptr_t)hook->src + sizeof(jmp_instr));
memcpy((void *)((intptr_t)hook->src + sizeof(jmp_opcode)), &offset,
offset = (intptr_t)hook->dst - (
(intptr_t)hook->src + sizeof(jmp_instr));
memcpy((void *)((intptr_t)hook->src + sizeof(jmp_opcode)),
&offset,
sizeof(jmp_instr) - sizeof(jmp_opcode));
hook->installed = 1;
@@ -91,7 +97,8 @@ SUBHOOK_EXPORT int SUBHOOK_API subhook_remove(subhook_t hook) {
if (!hook->installed)
return -EINVAL;
memcpy(hook->src, ((struct subhook_x86 *)hook)->code,
memcpy(hook->src,
((struct subhook_x86 *)hook)->code,
sizeof(jmp_instr));
hook->installed = 0;
@@ -106,7 +113,8 @@ SUBHOOK_EXPORT void *SUBHOOK_API subhook_read_dst(void *src) {
if (opcode != jmp_opcode)
return NULL;
memcpy(&offset, (void *)((intptr_t)src + sizeof(jmp_opcode)),
memcpy(&offset,
(void *)((intptr_t)src + sizeof(jmp_opcode)),
sizeof(offset));
return (void *)(offset + (intptr_t)src + sizeof(jmp_instr));
}