Do not assume program header is sorted by VA

Do not assume program header is sorted ascendantly by virtual address, otherwise loader_result.kernel_end may be wrong. Signed-off-by: Liu Jiang <[email protected]>
rust-vmm · Mar 28, 2020 · 025db34 · 025db34
1 parent c51e6e1
commit 025db34
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/coverage_config_x86_64.json b/coverage_config_x86_64.json
@@ -1,5 +1,5 @@
 {
-  "coverage_score": 74.7,
+  "coverage_score": 74.8,
   "exclude_path": "",
   "crate_features": ""
 }
diff --git a/src/loader/x86_64/elf/mod.rs b/src/loader/x86_64/elf/mod.rs
@@ -236,10 +236,11 @@ impl KernelLoader for Elf {
                 .read_exact_from(mem_offset, kernel_image, phdr.p_filesz as usize)
                 .map_err(|_| Error::ReadKernelImage)?;
 
-            loader_result.kernel_end = mem_offset
+            let kernel_end = mem_offset
                 .raw_value()
                 .checked_add(phdr.p_memsz as GuestUsize)
                 .ok_or(KernelLoaderError::MemoryOverflow)?;
+            loader_result.kernel_end = std::cmp::max(loader_result.kernel_end, kernel_end);
         }
 
         // elf image has no setup_header which is defined for bzImage
@@ -291,7 +292,7 @@ where
             kernel_image
                 .read_exact(&mut buf)
                 .map_err(|_| Error::ReadNoteHeader)?;
-            if buf == [b'x', b'e', b'n', b'\0'] {
+            if buf == [b'X', b'e', b'n', b'\0'] {
                 break;
             }
         }

diff --git a/src/loader/x86_64/elf/test_badnote.bin b/src/loader/x86_64/elf/test_badnote.bin
diff --git a/src/loader/x86_64/elf/test_elfnote.bin b/src/loader/x86_64/elf/test_elfnote.bin