elf: Fix elf program header verification logic

In the current ELF parser implementation, `verify_phdr` function returns an error when `p_vaddr` is not aligned. But since spec doesn't guarantee that `p_vaddr` must be aligned, fixed the check in our ELF parser. Also, a value of 0 or 1 for `p_align` means no alignment is required, so fix this check as well. Signed-off-by: Vijay Dhanraj <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
coconut-svsm · Nov 27, 2024 · d3fa746 · d3fa746
1 parent 2c1be77
commit d3fa746
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/elf/src/program_header.rs b/elf/src/program_header.rs
@@ -112,11 +112,12 @@ impl Elf64Phdr {
             return Err(ElfError::InvalidSegmentSize);
         }
 
-        if self.p_align != 0 {
+        if self.p_align > 1 {
             if !self.p_align.is_power_of_two() {
                 return Err(ElfError::InvalidAddressAlignment);
             }
-            if self.p_vaddr & (self.p_align - 1) != 0 {
+
+            if self.p_vaddr % self.p_align != self.p_offset % self.p_align {
                 return Err(ElfError::UnalignedSegmentAddress);
             }
         }