Updates to loaded libs

Author: AndrewQuijano

panda/plugins/loaded_libs/loaded_libs.cpp

@@ -14,6 +14,8 @@ void uninit_plugin(void *);
 #include "osi/osi_types.h"
 #include "osi/osi_ext.h"
 }
+bool debug = false;
+#define dprintf(...) if (debug) { printf(__VA_ARGS__); fflush(stdout); }
 
 #include<map>
 #include<vector>
@@ -24,62 +26,76 @@ using namespace std;
 typedef target_ulong Asid;
 
 void cleanup_osi(OsiProc *current, OsiThread *thread, GArray *ms) {
-    if (current) free_osiproc(current);
-    if (thread) free_osithread(thread);
-    if (ms) cleanup_garray(ms);
+    if (current) {
+        free_osiproc(current);
+    }
+    if (thread) {
+        free_osithread(thread);
+    }
+    if (ms) {
+        cleanup_garray(ms);
+    }
 }
 
-const char* program_name;
+const char * program_name;
 
 uint64_t get_libs_count = 0;
 uint64_t get_libs_failed_count = 0;
 
 void get_libs(CPUState *env) {
-
-    get_libs_count ++;
+    get_libs_count++;
     bool fail = false;
-    OsiProc *current =  get_current_process(env);
+    OsiProc * current = get_current_process(env);
     if (current == NULL) {
+        dprintf("[loaded_libs] get_current_process returned NULL\n");
         fail = true;
     }
     if (program_name && strcmp(current->name, program_name)) {
+        dprintf("[loaded_libs] program_name did not match %s\n", program_name);
         fail = true;
     }
     if (current->pid == 0) {
+        dprintf("[loaded_libs] current process pid is 0\n");
         fail = true;
     }
     GArray *ms = get_mappings(env, current);
     if (ms == NULL) {
+        dprintf("[loaded_libs] get_mappings failed \n");
         fail = true;
     }
     OsiThread *thread = get_current_thread(env);
     if (thread == NULL) {
+        dprintf("[loaded_libs] get_current_thread is NULL\n");
         fail = true;
     }
     assert (pandalog);
 
     if (fail) {
-        get_libs_failed_count ++;
+        get_libs_failed_count++;
     }
     else {
+        dprintf("[loaded_libs] get_libs succeeded\n");
         Panda__LogEntry ple = PANDA__LOG_ENTRY__INIT;
         Panda__LoadedLibs ll = PANDA__LOADED_LIBS__INIT;
         Panda__Module** m = (Panda__Module **) malloc (sizeof (Panda__Module *) * ms->len);
         for (int i = 0; i < ms->len; i++) {
             OsiModule *module = &g_array_index(ms, OsiModule, i);
             m[i] = (Panda__Module *) malloc (sizeof (Panda__Module));
             *(m[i]) = PANDA__MODULE__INIT;
-            if (module->name == 0x0)
-              m[i]->file = strdup("none");
-            else
-              m[i]->name = strdup(module->name);
-
-            if (module->file == 0x0)
+            if (module->name == 0x0) {
+                m[i]->file = strdup("none");
+            }
+            else {
+                m[i]->name = strdup(module->name);
+            }
+            if (module->file == 0x0) {
                 m[i]->file = strdup("none");
-            else
+            }
+            else {
                 m[i]->file = strdup(module->file);
-            m[i]->base_addr = module->base;
-            m[i]->size = module->size;
+            }
+            m[i]->base_addr = module -> base;
+            m[i]->size = module -> size;
         }
         ll.modules = m;
         ll.n_modules = ms->len;
@@ -105,19 +121,20 @@ void get_libs(CPUState *env) {
         }
         free(m);
     }
-
     cleanup_osi(current, thread, ms);
 }
 
 // 9 long sys_mmap(
 void mmap_return(CPUState *cpu, target_ulong pc, unsigned long addr, unsigned long length, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long offset) {
+    dprintf("[loaded_libs] mmap_return\n");
     get_libs(cpu);
 }
 
 uint64_t bb_count = 0;
 void before_block(CPUState *env, TranslationBlock *tb) {
     // check up on module list every 50 bb
-    bb_count ++;
+    dprintf("[loaded_libs] bb_count = %lu\n", bb_count);
+    bb_count++;
     if ((bb_count % 100) == 0) {
         get_libs(env);
     }
@@ -137,6 +154,7 @@ bool init_plugin(void *self) {
         panda_arg_list *args;
         args = panda_get_args("loaded_libs");
         program_name = panda_parse_string_opt(args, "program_name", NULL, "program name to collect libraries for");
+        debug = panda_parse_bool_opt(args, "debug", "enable debug output");
         return true;
     #else
         /* #error "No on_sys_mmap_return for target" */
@@ -146,7 +164,7 @@ bool init_plugin(void *self) {
 }
 
 void uninit_plugin(void *self) {
-    cout << "get_libs_count = " << get_libs_count << "\n";
-    cout << "get_libs_failed_count = " << get_libs_failed_count << "\n";
-    cout << "frac = " << ((float) get_libs_failed_count) / get_libs_count << "\n";
+    printf("get_libs_count = %ld\n", get_libs_count);
+    printf("get_libs_failed_count = %ld\n", get_libs_failed_count);
+    printf("frac = %.2f%%\n", (float) get_libs_failed_count / get_libs_count);
 }