Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

elf: program_headers: fix arithmetic overflows in file_range() and vm_range() #306

Merged
merged 1 commit into from
May 23, 2022
Merged

elf: program_headers: fix arithmetic overflows in file_range() and vm_range() #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/elf/program_header.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ if_alloc! {
}
/// Returns this program header's file offset range
pub fn file_range(&self) -> Range<usize> {
self.p_offset as usize..self.p_offset as usize + self.p_filesz as usize
self.p_offset as usize..self.p_offset.saturating_add(self.p_filesz) as usize
}
/// Returns this program header's virtual memory range
pub fn vm_range(&self) -> Range<usize> {
self.p_vaddr as usize..self.p_vaddr as usize + self.p_memsz as usize
self.p_vaddr as usize..self.p_vaddr.saturating_add(self.p_memsz) as usize
}
/// Sets the executable flag
pub fn executable(&mut self) {
Expand Down