diff options
Diffstat (limited to 'miasm2/jitter')
| -rw-r--r-- | miasm2/jitter/jitload.py | 21 | ||||
| -rw-r--r-- | miasm2/jitter/loader/elf.py | 6 | ||||
| -rw-r--r-- | miasm2/jitter/loader/pe.py | 12 | ||||
| -rw-r--r-- | miasm2/jitter/vm_mngr.c | 51 | ||||
| -rw-r--r-- | miasm2/jitter/vm_mngr.h | 3 | ||||
| -rw-r--r-- | miasm2/jitter/vm_mngr_py.c | 13 |
6 files changed, 70 insertions, 36 deletions
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py index aeb917d8..05a8575e 100644 --- a/miasm2/jitter/jitload.py +++ b/miasm2/jitter/jitload.py @@ -20,6 +20,7 @@ log_func = logging.getLogger('jit function call') log_func.addHandler(hnd) log_func.setLevel(logging.CRITICAL) + try: from miasm2.jitter.jitcore_tcc import JitCore_Tcc except ImportError: @@ -58,16 +59,17 @@ def named_arguments(func): arg_vals = namedtuple("args", args)(*arg_vals) # func_name(arguments) return address log_func.info('%s(%s) ret addr: %s', - whoami(), - ', '.join("%s=0x%x" % (field, value) - for field, value in arg_vals._asdict().iteritems()), - hex(ret_ad)) + get_caller_name(1), + ', '.join("%s=0x%x" % (field, value) + for field, value in arg_vals._asdict( + ).iteritems()), + hex(ret_ad)) return ret_ad, namedtuple("args", args)(*arg_vals) else: ret_ad, arg_vals = func(self, args) # func_name(arguments) return address log_func.info('%s(%s) ret addr: %s', - whoami(), + get_caller_name(1), ', '.join(hex(arg) for arg in arg_vals), hex(ret_ad)) return ret_ad, arg_vals @@ -231,7 +233,6 @@ class jitter: self.stack_size = 0x10000 self.stack_base = 0x1230000 - # Init callback handler self.breakpoints_handler = CallbackHandler() self.exceptions_handler = CallbackHandlerBitflag() @@ -268,7 +269,6 @@ class jitter: self.jit.addr_mod = interval([(addr, addr)]) self.jit.updt_automod_code(self.vm) - def set_breakpoint(self, addr, *args): """Set callbacks associated with addr. @addr: breakpoint address @@ -362,7 +362,8 @@ class jitter: def init_stack(self): self.vm.add_memory_page( - self.stack_base, PAGE_READ | PAGE_WRITE, "\x00" * self.stack_size) + self.stack_base, PAGE_READ | PAGE_WRITE, "\x00" * self.stack_size, + "Stack") sp = self.arch.getsp(self.attrib) setattr(self.cpu, sp.name, self.stack_base + self.stack_size) # regs = self.cpu.get_gpreg() @@ -380,7 +381,7 @@ class jitter: l = 0 tmp = addr while ((max_char is None or l < max_char) and - self.vm.get_mem(tmp, 1) != "\x00"): + self.vm.get_mem(tmp, 1) != "\x00"): tmp += 1 l += 1 return self.vm.get_mem(addr, l) @@ -392,7 +393,7 @@ class jitter: l = 0 tmp = addr while ((max_char is None or l < max_char) and - self.vm.get_mem(tmp, 2) != "\x00\x00"): + self.vm.get_mem(tmp, 2) != "\x00\x00"): tmp += 2 l += 2 s = self.vm.get_mem(addr, l) diff --git a/miasm2/jitter/loader/elf.py b/miasm2/jitter/loader/elf.py index 08df632a..db0f1cb7 100644 --- a/miasm2/jitter/loader/elf.py +++ b/miasm2/jitter/loader/elf.py @@ -47,7 +47,7 @@ def preload_elf(vm, e, runtime_lib, patch_vm_imp=True): return runtime_lib, dyn_funcs -def vm_load_elf(vm, fdata, **kargs): +def vm_load_elf(vm, fdata, name="", **kargs): """ Very dirty elf loader TODO XXX: implement real loader @@ -56,6 +56,7 @@ def vm_load_elf(vm, fdata, **kargs): e = elf_init.ELF(fdata, **kargs) i = interval() all_data = {} + for p in e.ph.phlist: if p.ph.type != elf_csts.PT_LOAD: continue @@ -72,7 +73,8 @@ def vm_load_elf(vm, fdata, **kargs): i += [(a_addr, b_addr - 2)] for a, b in i.intervals: # print hex(a), hex(b) - vm.add_memory_page(a, PAGE_READ | PAGE_WRITE, "\x00" * (b + 2 - a)) + vm.add_memory_page(a, PAGE_READ | PAGE_WRITE, "\x00" * (b + 2 - a), + repr(name)) for r_vaddr, data in all_data.items(): vm.set_mem(r_vaddr, data) diff --git a/miasm2/jitter/loader/pe.py b/miasm2/jitter/loader/pe.py index 1d33f9b8..2d80c8df 100644 --- a/miasm2/jitter/loader/pe.py +++ b/miasm2/jitter/loader/pe.py @@ -101,7 +101,7 @@ def get_export_name_addr_list(e): return out -def vm_load_pe(vm, fdata, align_s=True, load_hdr=True, **kargs): +def vm_load_pe(vm, fdata, align_s=True, load_hdr=True, name="", **kargs): """Load a PE in memory (@vm) from a data buffer @fdata @vm: VmMngr instance @fdata: data buffer to parse @@ -136,7 +136,7 @@ def vm_load_pe(vm, fdata, align_s=True, load_hdr=True, **kargs): pe_hdr = pe.content[:hdr_len] + max( 0, (min_len - hdr_len)) * "\x00" vm.add_memory_page(pe.NThdr.ImageBase, PAGE_READ | PAGE_WRITE, - pe_hdr) + pe_hdr, "%r: PE Header" % name) # Align sections size if align_s: @@ -160,7 +160,8 @@ def vm_load_pe(vm, fdata, align_s=True, load_hdr=True, **kargs): attrib = PAGE_READ if section.flags & 0x80000000: attrib |= PAGE_WRITE - vm.add_memory_page(pe.rva2virt(section.addr), attrib, data) + vm.add_memory_page(pe.rva2virt(section.addr), attrib, data, + "%r: %r" % (name, section.name)) return pe @@ -217,7 +218,7 @@ def vm_load_pe_lib(vm, fname_in, libs, lib_path_base, **kargs): fname = os.path.join(lib_path_base, fname_in) with open(fname) as fstream: - pe = vm_load_pe(vm, fstream.read(), **kargs) + pe = vm_load_pe(vm, fstream.read(), name=fname_in, **kargs) libs.add_export_lib(pe, fname_in) return pe @@ -484,7 +485,8 @@ def vm_load_pe_and_dependencies(vm, fname, name2module, runtime_lib, try: with open(fname) as fstream: log.info('Loading module name %r', fname) - pe_obj = vm_load_pe(vm, fstream.read(), **kwargs) + pe_obj = vm_load_pe( + vm, fstream.read(), name=fname, **kwargs) except IOError: log.error('Cannot open %s' % fname) name2module[name] = None diff --git a/miasm2/jitter/vm_mngr.c b/miasm2/jitter/vm_mngr.c index fd5b870d..a0c2f5a3 100644 --- a/miasm2/jitter/vm_mngr.c +++ b/miasm2/jitter/vm_mngr.c @@ -1268,26 +1268,35 @@ uint64_t double_to_mem_64(double d) return m; } -struct memory_page_node * create_memory_page_node(uint64_t ad, unsigned int size, unsigned int access) +struct memory_page_node * create_memory_page_node(uint64_t ad, unsigned int size, unsigned int access, char* name) { struct memory_page_node * mpn; - void* p; + void* ad_hp; mpn = malloc(sizeof(*mpn)); if (!mpn){ fprintf(stderr, "Error: cannot alloc mpn\n"); return NULL; } - p = malloc(size); - if (!p){ + ad_hp = malloc(size); + if (!ad_hp){ free(mpn); fprintf(stderr, "Error: cannot alloc %d\n", size); return NULL; } + mpn->name = malloc(strlen(name) + 1); + if (!mpn->name){ + free(mpn); + free(ad_hp); + fprintf(stderr, "Error: cannot alloc\n"); + return NULL; + } + mpn->ad = ad; mpn->size = size; mpn->access = access; - mpn->ad_hp = p; + mpn->ad_hp = ad_hp; + strcpy(mpn->name, name); return mpn; } @@ -1440,31 +1449,41 @@ void add_memory_page(vm_mngr_t* vm_mngr, struct memory_page_node* mpn_a) /* Return a char* representing the repr of vm_mngr_t object */ char* dump(vm_mngr_t* vm_mngr) { - char buf[100]; + char buf[0x100]; int length; - int total_len = 0; char *buf_final; int i; + char buf_addr[0x20]; + char buf_size[0x20]; struct memory_page_node * mpn; + /* 0x1234567812345678 0x1234567812345678 */ + char* intro = "Addr Size Access Comment\n"; + int total_len = strlen(intro) + 1; - buf_final = malloc(1); + buf_final = malloc(total_len); if (buf_final == NULL) { fprintf(stderr, "Error: cannot alloc\n"); exit(0); } - buf_final[0] = '\x00'; - + strcpy(buf_final, intro); for (i=0; i< vm_mngr->memory_pages_number; i++) { mpn = &vm_mngr->memory_pages_array[i]; - length = snprintf(buf, sizeof(buf), - "ad 0x%"PRIX64" size 0x%"PRIX64" %c%c%c\n", - (uint64_t)mpn->ad, - (uint64_t)mpn->size, + snprintf(buf_addr, sizeof(buf_addr), + "0x%"PRIX64, (uint64_t)mpn->ad); + snprintf(buf_size, sizeof(buf_size), + "0x%"PRIX64, (uint64_t)mpn->size); + + length = snprintf(buf, sizeof(buf) - 1, + "%-18s %-18s %c%c%c %s", + buf_addr, + buf_size, mpn->access & PAGE_READ? 'R':'_', mpn->access & PAGE_WRITE? 'W':'_', - mpn->access & PAGE_EXEC? 'X':'_' + mpn->access & PAGE_EXEC? 'X':'_', + mpn->name ); - total_len += length+1; + strcat(buf, "\n"); + total_len += length + 1 + 1; buf_final = realloc(buf_final, total_len); if (buf_final == NULL) { fprintf(stderr, "Error: cannot alloc\n"); diff --git a/miasm2/jitter/vm_mngr.h b/miasm2/jitter/vm_mngr.h index 02b5de73..acea4875 100644 --- a/miasm2/jitter/vm_mngr.h +++ b/miasm2/jitter/vm_mngr.h @@ -70,6 +70,7 @@ struct memory_page_node { uint64_t size; uint64_t access; void* ad_hp; + char* name; }; @@ -258,7 +259,7 @@ void hexdump(char* m, unsigned int l); struct code_bloc_node * create_code_bloc_node(uint64_t ad_start, uint64_t ad_stop); void add_code_bloc(vm_mngr_t* vm_mngr, struct code_bloc_node* cbp); -struct memory_page_node * create_memory_page_node(uint64_t ad, unsigned int size, unsigned int access);//memory_page* mp); +struct memory_page_node * create_memory_page_node(uint64_t ad, unsigned int size, unsigned int access, char* name);//memory_page* mp); void init_memory_page_pool(vm_mngr_t* vm_mngr); void init_code_bloc_pool(vm_mngr_t* vm_mngr); void reset_memory_page_pool(vm_mngr_t* vm_mngr); diff --git a/miasm2/jitter/vm_mngr_py.c b/miasm2/jitter/vm_mngr_py.c index 0a22c397..fdadf7f1 100644 --- a/miasm2/jitter/vm_mngr_py.c +++ b/miasm2/jitter/vm_mngr_py.c @@ -86,16 +86,18 @@ PyObject* vm_add_memory_page(VmMngr* self, PyObject* args) PyObject *addr; PyObject *access; PyObject *item_str; + PyObject *name=NULL; uint64_t buf_size; char* buf_data; Py_ssize_t length; uint64_t ret = 0x1337beef; uint64_t page_addr; uint64_t page_access; + char* name_ptr; struct memory_page_node * mpn; - if (!PyArg_ParseTuple(args, "OOO", &addr, &access, &item_str)) + if (!PyArg_ParseTuple(args, "OOO|O", &addr, &access, &item_str, &name)) return NULL; PyGetInt(addr, page_addr); @@ -107,7 +109,14 @@ PyObject* vm_add_memory_page(VmMngr* self, PyObject* args) buf_size = PyString_Size(item_str); PyString_AsStringAndSize(item_str, &buf_data, &length); - mpn = create_memory_page_node(page_addr, buf_size, page_access); + if (name == NULL) { + name_ptr = (char*)""; + } else { + if (!PyString_Check(name)) + RAISE(PyExc_TypeError,"name must be str"); + name_ptr = PyString_AsString(name); + } + mpn = create_memory_page_node(page_addr, buf_size, page_access, name_ptr); if (mpn == NULL) RAISE(PyExc_TypeError,"cannot create page"); if (is_mpn_in_tab(&self->vm_mngr, mpn)) { |