More PT decoding options

gnbon · Feb 4, 2019 · d79c71f · d79c71f
1 parent 7dd4dbb
commit d79c71f
Show file tree

Hide file tree

Showing 15 changed files with 797 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,6 +89,7 @@ if (${INTELPT})
 
   SET(PT_ADDITIONAL_SOURCES
     winaflpt.c
+    ptdecode.c
     third_party/processor-trace/libipt/src/pt_cpu.c
     third_party/processor-trace/libipt/src/windows/pt_cpuid.c
     )

diff --git a/afl-fuzz.c b/afl-fuzz.c
@@ -4019,6 +4019,10 @@ static void maybe_delete_out_dir(void) {
   if(delete_subdirectories(fn)) goto dir_cleanup_failed;
   ck_free(fn);
 
+  fn = alloc_printf("%s\\ptmodules", out_dir);
+  if (delete_files(fn, NULL)) goto dir_cleanup_failed;
+  ck_free(fn);
+
   OKF("Output dir cleanup successful.");
 
   /* Wow... is that all? If yes, celebrate! */
@@ -7172,6 +7176,10 @@ static void setup_dirs_fds(void) {
   if (mkdir(tmp)) PFATAL("Unable to create '%s'", tmp);
   ck_free(tmp);
 
+  tmp = alloc_printf("%s\\ptmodules", out_dir);
+  if (mkdir(tmp)) PFATAL("Unable to create '%s'", tmp);
+  ck_free(tmp);
+
 }
 
 
@@ -7917,7 +7925,9 @@ int main(int argc, char** argv) {
 
   if (use_intelpt) {
 #ifdef INTELPT
-	  int pt_options = pt_init(argc - optind, argv + optind);
+	  char *modules_dir = alloc_printf("%s\\ptmodules", out_dir);
+	  int pt_options = pt_init(argc - optind, argv + optind, modules_dir);
+	  ck_free(modules_dir);
 	  if (!pt_options) usage(argv[0]);
 	  optind += pt_options;
 #endif

diff --git a/bin32/afl-fuzz.exe b/bin32/afl-fuzz.exe
diff --git a/bin32/libipt.dll b/bin32/libipt.dll
diff --git a/bin32/winaflpt-debug.exe b/bin32/winaflpt-debug.exe
diff --git a/bin64/afl-fuzz.exe b/bin64/afl-fuzz.exe
diff --git a/bin64/libipt.dll b/bin64/libipt.dll
diff --git a/bin64/winaflpt-debug.exe b/bin64/winaflpt-debug.exe
diff --git a/ipttool.c b/ipttool.c
diff --git a/ipttool.h b/ipttool.h
@@ -1,4 +1,4 @@
 BOOL EnableAndValidateIptServices(VOID);
-BOOL ConfigureBufferSize(_In_ PWCHAR pwszSize, _Inout_ PIPT_OPTIONS pOptions);
-BOOL ConfigureTraceFlags(_In_ PWCHAR pwszFlags, _Inout_ PIPT_OPTIONS pOptions);
+BOOL ConfigureBufferSize(_In_ DWORD dwSize, _Inout_ PIPT_OPTIONS pOptions);
+BOOL ConfigureTraceFlags(_In_ DWORD dwFlags, _Inout_ PIPT_OPTIONS pOptions);
 PIPT_TRACE_DATA GetIptTrace(HANDLE hProcess);