Merge pull request #139 from acheron2302/main

Fixing the memory alignment when mapping pe

Author: sha0coder

crates/libmwemu/src/emu/loaders.rs

@@ -9,6 +9,13 @@ use crate::pe::pe32::PE32;
 use crate::pe::pe64::PE64;
 use crate::peb::{peb32, peb64};
 
+macro_rules! align_up {
+    ($size:expr, $align:expr) => {{
+        // Ensure alignment is a power of two at compile time if possible
+        ($size + $align - 1) & !($align - 1)
+    }};
+}
+
 impl Emu {
     /// Complex funtion called from many places and with multiple purposes.
     /// This is called from load_code() if sample is PE32, but also from load_library etc.
@@ -99,13 +106,14 @@ impl Emu {
             log::info!("base: 0x{:x}", base);
         }
 
+        let sec_allign = pe32.opt.section_alignment;
         // 4. map pe and then sections
         let pemap = self
             .maps
             .create_map(
                 &format!("{}.pe", filename2),
                 base.into(),
-                pe32.opt.size_of_headers.into(),
+                align_up!(pe32.opt.size_of_headers, sec_allign) as u64,
                 Permission::READ_WRITE,
             )
             .expect("cannot create pe map");
@@ -145,7 +153,7 @@ impl Emu {
             let map = match self.maps.create_map(
                 &format!("{}{}", filename2, sect_name),
                 base as u64 + sect.virtual_address as u64,
-                sz,
+                align_up!(sz, sec_allign as u64),
                 permission,
             ) {
                 Ok(m) => m,
@@ -260,11 +268,12 @@ impl Emu {
             log::info!("base: 0x{:x}", base);
         }
 
+        let sec_allign = pe64.opt.section_alignment;
         // 4. map pe and then sections
         let pemap = match self.maps.create_map(
             &format!("{}.pe", filename2),
             base,
-            pe64.opt.size_of_headers.into(),
+            align_up!(pe64.opt.size_of_headers, sec_allign) as u64,
             Permission::READ_WRITE,
         ) {
             Ok(m) => m,
@@ -308,7 +317,7 @@ impl Emu {
             let map = match self.maps.create_map(
                 &format!("{}{}", filename2, sect_name),
                 base + sect.virtual_address as u64,
-                sz,
+                align_up!(sz, sec_allign as u64),
                 permission,
             ) {
                 Ok(m) => m,

crates/libmwemu/src/engine/instructions/call.rs

@@ -35,7 +35,7 @@ pub fn execute(emu: &mut Emu, ins: &Instruction, instruction_sz: usize, _rep_ste
           emu.stack_lvl.push(0);
           emu.stack_lvl_idx += 1;
       }*/
-    
+
     let rip = emu.regs().rip;
     emu.call_stack_mut().push((rip, addr));
 

crates/libmwemu/src/engine/instructions/mov.rs

@@ -16,7 +16,6 @@ pub fn execute(emu: &mut Emu, ins: &Instruction, instruction_sz: usize, _rep_ste
         emu.show_instruction_comment(color!("LightCyan"), ins, &format!("0x{:x}", value1));
     }
 
-
     /*
     if emu.pos == 189464541 {
         let addr = emu.get_operand_value(ins, 1, false).unwrap();