T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch overflows when performing relocations

Browse Source
This commit is contained in:
bjorn3
2020-11-12 14:13:06 +01:00
parent b7a93c2321
commit 11a3bdfc6a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cranelift/simplejit/src/compiled_blob.rs
View File

@@ -21,27 +21,24 @@ impl CompiledBlob {
} in &self.relocs } in &self.relocs
{ {
debug_assert!((offset as usize) < self.size); debug_assert!((offset as usize) < self.size);
let at = unsafe { self.ptr.offset(offset as isize) }; let at = unsafe { self.ptr.offset(isize::try_from(offset).unwrap()) };
let base = get_definition(name); let base = get_definition(name);
// TODO: Handle overflow. let what = unsafe { base.offset(isize::try_from(addend).unwrap()) };
let what = unsafe { base.offset(addend as isize) };
match reloc { match reloc {
Reloc::Abs4 => { Reloc::Abs4 => {
// TODO: Handle overflow.
#[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_ptr_alignment))] #[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_ptr_alignment))]
unsafe { unsafe {
write_unaligned(at as *mut u32, what as u32) write_unaligned(at as *mut u32, u32::try_from(what as usize).unwrap())
}; };
} }
Reloc::Abs8 => { Reloc::Abs8 => {
#[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_ptr_alignment))] #[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_ptr_alignment))]
unsafe { unsafe {
write_unaligned(at as *mut u64, what as u64) write_unaligned(at as *mut u64, u64::try_from(what as usize).unwrap())
}; };
} }
Reloc::X86PCRel4 | Reloc::X86CallPCRel4 => { Reloc::X86PCRel4 | Reloc::X86CallPCRel4 => {
// TODO: Handle overflow. let pcrel = i32::try_from((what as isize) - (at as isize)).unwrap();
let pcrel = ((what as isize) - (at as isize)) as i32;
#[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_ptr_alignment))] #[cfg_attr(feature = "cargo-clippy", allow(clippy::cast_ptr_alignment))]
unsafe { unsafe {
write_unaligned(at as *mut i32, pcrel) write_unaligned(at as *mut i32, pcrel)