|
@@ -189,17 +189,29 @@ void lots_o_noops_around_write(int *write_to_me)
|
|
|
#define u64 uint64_t
|
|
|
|
|
|
#ifdef __i386__
|
|
|
-#define SYS_mprotect_key 380
|
|
|
-#define SYS_pkey_alloc 381
|
|
|
-#define SYS_pkey_free 382
|
|
|
+
|
|
|
+#ifndef SYS_mprotect_key
|
|
|
+# define SYS_mprotect_key 380
|
|
|
+#endif
|
|
|
+#ifndef SYS_pkey_alloc
|
|
|
+# define SYS_pkey_alloc 381
|
|
|
+# define SYS_pkey_free 382
|
|
|
+#endif
|
|
|
#define REG_IP_IDX REG_EIP
|
|
|
#define si_pkey_offset 0x14
|
|
|
+
|
|
|
#else
|
|
|
-#define SYS_mprotect_key 329
|
|
|
-#define SYS_pkey_alloc 330
|
|
|
-#define SYS_pkey_free 331
|
|
|
+
|
|
|
+#ifndef SYS_mprotect_key
|
|
|
+# define SYS_mprotect_key 329
|
|
|
+#endif
|
|
|
+#ifndef SYS_pkey_alloc
|
|
|
+# define SYS_pkey_alloc 330
|
|
|
+# define SYS_pkey_free 331
|
|
|
+#endif
|
|
|
#define REG_IP_IDX REG_RIP
|
|
|
#define si_pkey_offset 0x20
|
|
|
+
|
|
|
#endif
|
|
|
|
|
|
void dump_mem(void *dumpme, int len_bytes)
|