Fix page protection bug causing a rare startup crash (bug 5133, r=fyren).
Fix page protection bug causing a rare startup crash (
bug 5133, r=fyren).
1.1 --- a/core-legacy/sourcehook/sh_memory.h Sat Oct 08 16:29:03 2011 -0700
1.2 +++ b/core-legacy/sourcehook/sh_memory.h Sat Oct 15 22:16:50 2011 -0700
1.3 @@ -47,6 +47,116 @@
1.4
1.5 namespace SourceHook
1.6 {
1.7 + static inline bool GetPageBits(void *addr, int *bits)
1.8 + {
1.9 +#if SH_SYS == SH_SYS_LINUX
1.10 + // On linux, first check /proc/self/maps
1.11 + unsigned long laddr = reinterpret_cast<unsigned long>(addr);
1.12 +
1.13 + FILE *pF = fopen("/proc/self/maps", "r");
1.14 + if (pF) {
1.15 + // Linux /proc/self/maps -> parse
1.16 + // Format:
1.17 + // lower upper prot stuff path
1.18 + // 08048000-0804c000 r-xp 00000000 03:03 1010107 /bin/cat
1.19 + unsigned long rlower, rupper;
1.20 + char r, w, x;
1.21 + while (fscanf(pF, "%lx-%lx %c%c%c", &rlower, &rupper, &r, &w, &x) != EOF) {
1.22 + // Check whether we're IN THERE!
1.23 + if (laddr >= rlower && laddr < rupper) {
1.24 + fclose(pF);
1.25 + *bits = 0;
1.26 + if (r == 'r')
1.27 + *bits |= SH_MEM_READ;
1.28 + if (w == 'w')
1.29 + *bits |= SH_MEM_WRITE;
1.30 + if (x == 'x')
1.31 + *bits |= SH_MEM_EXEC;
1.32 + return true;
1.33 + }
1.34 + // Read to end of line
1.35 + int c;
1.36 + while ((c = fgetc(pF)) != '\n') {
1.37 + if (c == EOF)
1.38 + break;
1.39 + }
1.40 + if (c == EOF)
1.41 + break;
1.42 + }
1.43 + fclose(pF);
1.44 + return false;
1.45 + }
1.46 + pF = fopen("/proc/curproc/map", "r");
1.47 + if (pF) {
1.48 + // FreeBSD /proc/curproc/map -> parse
1.49 + // 0x804800 0x805500 13 15 0xc6e18960 r-x 21 0x0 COW NC vnode
1.50 + unsigned long rlower, rupper, ignoreLong;
1.51 + int ignoreInt;
1.52 + char r, w, x;
1.53 + while (fscanf(pF, "0x%lx 0x%lx %d %d 0x%lx %c%c%c", &rlower, &rupper, &ignoreInt,
1.54 + &ignoreInt, &ignoreLong, &r, &w, &x) != EOF) {
1.55 + // Check whether we're IN THERE!
1.56 + if (laddr >= rlower && laddr < rupper) {
1.57 + fclose(pF);
1.58 + *bits = 0;
1.59 + if (r == 'r')
1.60 + *bits |= SH_MEM_READ;
1.61 + if (r == 'w')
1.62 + *bits |= SH_MEM_WRITE;
1.63 + if (r == 'x')
1.64 + *bits |= SH_MEM_EXEC;
1.65 + return true;
1.66 + }
1.67 + // Read to end of line
1.68 + int c;
1.69 + while ((c = fgetc(pF)) != '\n') {
1.70 + if (c == EOF)
1.71 + break;
1.72 + }
1.73 + if (c == EOF)
1.74 + break;
1.75 + }
1.76 + fclose(pF);
1.77 + return false;
1.78 + }
1.79 + return false;
1.80 +#elif SH_SYS == SH_SYS_APPLE
1.81 +#elif SH_XP == SH_XP_WINAPI
1.82 + SYSTEM_INFO info;
1.83 + GetSystemInfo(&info);
1.84 +
1.85 + MEMORY_BASIC_INFORMATION mem;
1.86 + size_t base = size_t(addr) & ~size_t(info.dwPageSize - 1);
1.87 + if (!VirtualQuery((void *)base, &mem, sizeof(mem)))
1.88 + return false;
1.89 + switch (mem.Protect) {
1.90 + case PAGE_EXECUTE:
1.91 + *bits = SH_MEM_EXEC;
1.92 + break;
1.93 + case PAGE_EXECUTE_READ:
1.94 + *bits = SH_MEM_EXEC | SH_MEM_READ;
1.95 + break;
1.96 + case PAGE_EXECUTE_READWRITE:
1.97 + case PAGE_EXECUTE_WRITECOPY:
1.98 + *bits = SH_MEM_EXEC | SH_MEM_READ | SH_MEM_WRITE;
1.99 + break;
1.100 + case PAGE_NOACCESS:
1.101 + *bits = 0;
1.102 + break;
1.103 + case PAGE_READONLY:
1.104 + *bits = SH_MEM_READ;
1.105 + break;
1.106 + case PAGE_READWRITE:
1.107 + case PAGE_WRITECOPY:
1.108 + *bits = SH_MEM_READ | SH_MEM_WRITE;
1.109 + break;
1.110 + default:
1.111 + return false;
1.112 + }
1.113 + return true;
1.114 +#endif
1.115 + }
1.116 +
1.117 inline bool SetMemAccess(void *addr, size_t len, int access)
1.118 {
1.119 # if SH_XP == SH_XP_POSIX
1.120 @@ -70,6 +180,19 @@
1.121 # endif
1.122 }
1.123
1.124 + inline bool MakePageWritable(void *addr)
1.125 + {
1.126 + int bits;
1.127 + if (GetPageBits(addr, &bits)) {
1.128 + if (bits & SH_MEM_WRITE)
1.129 + return true;
1.130 + bits |= SH_MEM_WRITE;
1.131 + } else {
1.132 + bits = SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC;
1.133 + }
1.134 + return SetMemAccess(addr, sizeof(void *), bits);
1.135 + }
1.136 +
1.137 #if SH_XP == SH_XP_POSIX
1.138 namespace
1.139 {
2.1 --- a/core-legacy/sourcehook/sourcehook.cpp Sat Oct 08 16:29:03 2011 -0700
2.2 +++ b/core-legacy/sourcehook/sourcehook.cpp Sat Oct 15 22:16:50 2011 -0700
2.3 @@ -366,7 +366,7 @@
2.4 CVfnPtr vfp(cur_vfnptr, &m_OneIgnore);
2.5
2.6 // Alter vtable entry
2.7 - if (!SetMemAccess(cur_vtptr, sizeof(void*) * (tmp.m_VtblIdx + 1), SH_MEM_READ | SH_MEM_WRITE))
2.8 + if (!MakePageWritable(cur_vtptr))
2.9 return 0;
2.10
2.11 *reinterpret_cast<void**>(cur_vfnptr) = *reinterpret_cast<void**>(hookman->m_HookfuncVfnptr);
3.1 --- a/core/sourcehook/sh_memory.h Sat Oct 08 16:29:03 2011 -0700
3.2 +++ b/core/sourcehook/sh_memory.h Sat Oct 15 22:16:50 2011 -0700
3.3 @@ -43,11 +43,145 @@
3.4 # else
3.5 # error Unsupported OS/Compiler
3.6 # endif
3.7 +#if SH_SYS == SH_SYS_APPLE
3.8 +# include <mach/mach.h>
3.9 +# include <mach/vm_region.h>
3.10 +# include <mach/mach_traps.h>
3.11 +#endif
3.12
3.13 #include "sh_list.h"
3.14
3.15 namespace SourceHook
3.16 {
3.17 + static inline bool GetPageBits(void *addr, int *bits)
3.18 + {
3.19 +#if SH_SYS == SH_SYS_LINUX
3.20 + // On linux, first check /proc/self/maps
3.21 + unsigned long laddr = reinterpret_cast<unsigned long>(addr);
3.22 +
3.23 + FILE *pF = fopen("/proc/self/maps", "r");
3.24 + if (pF) {
3.25 + // Linux /proc/self/maps -> parse
3.26 + // Format:
3.27 + // lower upper prot stuff path
3.28 + // 08048000-0804c000 r-xp 00000000 03:03 1010107 /bin/cat
3.29 + unsigned long rlower, rupper;
3.30 + char r, w, x;
3.31 + while (fscanf(pF, "%lx-%lx %c%c%c", &rlower, &rupper, &r, &w, &x) != EOF) {
3.32 + // Check whether we're IN THERE!
3.33 + if (laddr >= rlower && laddr < rupper) {
3.34 + fclose(pF);
3.35 + *bits = 0;
3.36 + if (r == 'r')
3.37 + *bits |= SH_MEM_READ;
3.38 + if (w == 'w')
3.39 + *bits |= SH_MEM_WRITE;
3.40 + if (x == 'x')
3.41 + *bits |= SH_MEM_EXEC;
3.42 + return true;
3.43 + }
3.44 + // Read to end of line
3.45 + int c;
3.46 + while ((c = fgetc(pF)) != '\n') {
3.47 + if (c == EOF)
3.48 + break;
3.49 + }
3.50 + if (c == EOF)
3.51 + break;
3.52 + }
3.53 + fclose(pF);
3.54 + return false;
3.55 + }
3.56 + pF = fopen("/proc/curproc/map", "r");
3.57 + if (pF) {
3.58 + // FreeBSD /proc/curproc/map -> parse
3.59 + // 0x804800 0x805500 13 15 0xc6e18960 r-x 21 0x0 COW NC vnode
3.60 + unsigned long rlower, rupper, ignoreLong;
3.61 + int ignoreInt;
3.62 + char r, w, x;
3.63 + while (fscanf(pF, "0x%lx 0x%lx %d %d 0x%lx %c%c%c", &rlower, &rupper, &ignoreInt,
3.64 + &ignoreInt, &ignoreLong, &r, &w, &x) != EOF) {
3.65 + // Check whether we're IN THERE!
3.66 + if (laddr >= rlower && laddr < rupper) {
3.67 + fclose(pF);
3.68 + *bits = 0;
3.69 + if (r == 'r')
3.70 + *bits |= SH_MEM_READ;
3.71 + if (r == 'w')
3.72 + *bits |= SH_MEM_WRITE;
3.73 + if (r == 'x')
3.74 + *bits |= SH_MEM_EXEC;
3.75 + return true;
3.76 + }
3.77 + // Read to end of line
3.78 + int c;
3.79 + while ((c = fgetc(pF)) != '\n') {
3.80 + if (c == EOF)
3.81 + break;
3.82 + }
3.83 + if (c == EOF)
3.84 + break;
3.85 + }
3.86 + fclose(pF);
3.87 + return false;
3.88 + }
3.89 + return false;
3.90 +#elif SH_SYS == SH_SYS_APPLE
3.91 + vm_size_t ignoreSize;
3.92 + vm_address_t vmaddr = (vm_address_t)addr;
3.93 + vm_region_basic_info_data_t info;
3.94 + vm_region_flavor_t flavor = VM_REGION_BASIC_INFO;
3.95 + memory_object_name_t obj;
3.96 +
3.97 + mach_msg_type_number_t count = VM_REGION_BASIC_INFO_COUNT;
3.98 + kern_return_t kr = vm_region(mach_task_self(), &vmaddr, &ignoreSize, flavor,
3.99 + (vm_region_info_t)&info, &count, &obj);
3.100 + if (kr != KERN_SUCCESS)
3.101 + return false;
3.102 + *bits = 0;
3.103 + if (info.protection & VM_PROT_READ)
3.104 + *bits |= SH_MEM_READ;
3.105 + if (info.protection & VM_PROT_WRITE)
3.106 + *bits |= SH_MEM_WRITE;
3.107 + if (info.protection & VM_PROT_EXECUTE)
3.108 + *bits |= SH_MEM_EXEC;
3.109 + return true;
3.110 +#elif SH_XP == SH_XP_WINAPI
3.111 + SYSTEM_INFO info;
3.112 + GetSystemInfo(&info);
3.113 +
3.114 + MEMORY_BASIC_INFORMATION mem;
3.115 + size_t base = size_t(addr) & ~size_t(info.dwPageSize - 1);
3.116 + if (!VirtualQuery((void *)base, &mem, sizeof(mem)))
3.117 + return false;
3.118 + switch (mem.Protect) {
3.119 + case PAGE_EXECUTE:
3.120 + *bits = SH_MEM_EXEC;
3.121 + break;
3.122 + case PAGE_EXECUTE_READ:
3.123 + *bits = SH_MEM_EXEC | SH_MEM_READ;
3.124 + break;
3.125 + case PAGE_EXECUTE_READWRITE:
3.126 + case PAGE_EXECUTE_WRITECOPY:
3.127 + *bits = SH_MEM_EXEC | SH_MEM_READ | SH_MEM_WRITE;
3.128 + break;
3.129 + case PAGE_NOACCESS:
3.130 + *bits = 0;
3.131 + break;
3.132 + case PAGE_READONLY:
3.133 + *bits = SH_MEM_READ;
3.134 + break;
3.135 + case PAGE_READWRITE:
3.136 + case PAGE_WRITECOPY:
3.137 + *bits = SH_MEM_READ | SH_MEM_WRITE;
3.138 + break;
3.139 + default:
3.140 + return false;
3.141 + }
3.142 + return true;
3.143 +#endif
3.144 + }
3.145 +
3.146 inline bool SetMemAccess(void *addr, size_t len, int access)
3.147 {
3.148 # if SH_XP == SH_XP_POSIX
3.149 @@ -71,6 +205,19 @@
3.150 # endif
3.151 }
3.152
3.153 + inline bool MakePageWritable(void *addr)
3.154 + {
3.155 + int bits;
3.156 + if (GetPageBits(addr, &bits)) {
3.157 + if (bits & SH_MEM_WRITE)
3.158 + return true;
3.159 + bits |= SH_MEM_WRITE;
3.160 + } else {
3.161 + bits = SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC;
3.162 + }
3.163 + return SetMemAccess(addr, sizeof(void *), bits);
3.164 + }
3.165 +
3.166 #if SH_XP == SH_XP_POSIX
3.167 namespace
3.168 {
4.1 --- a/core/sourcehook/sourcehook_impl_cvfnptr.cpp Sat Oct 08 16:29:03 2011 -0700
4.2 +++ b/core/sourcehook/sourcehook_impl_cvfnptr.cpp Sat Oct 15 22:16:50 2011 -0700
4.3 @@ -217,7 +217,7 @@
4.4
4.5 bool CVfnPtr::Patch(void *newValue)
4.6 {
4.7 - if (!SetMemAccess(m_Ptr, sizeof(void*), SH_MEM_READ | SH_MEM_WRITE))
4.8 + if (!MakePageWritable(m_Ptr))
4.9 {
4.10 return false;
4.11 }