Align ELF segments to avoid subtract overflow

redox-os · Jun 5, 2017 · 8d89925 · 8d89925
1 parent 138463b
commit 8d89925
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/syscall/process.rs b/src/syscall/process.rs
@@ -593,9 +593,12 @@ pub fn exec(path: &[u8], arg_ptrs: &[[usize; 2]]) -> Result<usize> {
                     let mut tls_option = None;
                     for segment in elf.segments() {
                         if segment.p_type == program_header::PT_LOAD {
+                            let voff = segment.p_vaddr % 4096;
+                            let vaddr = segment.p_vaddr - voff;
+
                             let mut memory = context::memory::Memory::new(
-                                VirtualAddress::new(segment.p_vaddr as usize),
-                                segment.p_memsz as usize,
+                                VirtualAddress::new(vaddr as usize),
+                                segment.p_memsz as usize + voff as usize,
                                 entry::NO_EXECUTE | entry::WRITABLE,
                                 true
                             );