user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct bit size when reading usize values

Browse source
This commit is contained in:
Oliver Schneider 2018-06-03 11:54:17 +02:00
parent 8284b4e912
commit cec51f8513
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/fn_call.rs
View file

@ -194,7 +194,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
match &link_name[..] {
"malloc" => {
let size = self.value_to_scalar(args[0])?.to_u64()?;
let size = self.value_to_scalar(args[0])?.to_usize(self)?;
if size == 0 {
self.write_null(dest, dest_ty)?;
} else {
@ -221,7 +221,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
//
// libc::syscall(NR_GETRANDOM, buf.as_mut_ptr(), buf.len(), GRND_NONBLOCK)
// is called if a `HashMap` is created the regular way.
match self.value_to_scalar(args[0])?.to_u64()? {
match self.value_to_scalar(args[0])?.to_usize(self)? {
318 | 511 => {
return err!(Unimplemented(
"miri does not support random number generators".to_owned(),
@ -293,7 +293,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
"memcmp" => {
let left = self.into_ptr(args[0].value)?;
let right = self.into_ptr(args[1].value)?;
let n = Size::from_bytes(self.value_to_scalar(args[2])?.to_u64()?);
let n = Size::from_bytes(self.value_to_scalar(args[2])?.to_usize(self)?);
let result = {
let left_bytes = self.memory.read_bytes(left, n)?;
@ -317,7 +317,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
"memrchr" => {
let ptr = self.into_ptr(args[0].value)?;
let val = self.value_to_scalar(args[1])?.to_bytes()? as u8;
let num = self.value_to_scalar(args[2])?.to_u64()?;
let num = self.value_to_scalar(args[2])?.to_usize(self)?;
if let Some(idx) = self.memory.read_bytes(ptr, Size::from_bytes(num))?.iter().rev().position(
|&c| c == val,
)
@ -332,7 +332,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
"memchr" => {
let ptr = self.into_ptr(args[0].value)?;
let val = self.value_to_scalar(args[1])?.to_bytes()? as u8;
let num = self.value_to_scalar(args[2])?.to_u64()?;
let num = self.value_to_scalar(args[2])?.to_usize(self)?;
if let Some(idx) = self.memory.read_bytes(ptr, Size::from_bytes(num))?.iter().position(
|&c| c == val,
)
@ -457,7 +457,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
}
"sysconf" => {
let name = self.value_to_scalar(args[0])?.to_u64()?;
let name = self.value_to_scalar(args[0])?.to_usize(self)?;
trace!("sysconf() called with name {}", name);
// cache the sysconf integers via miri's global cache
@ -646,8 +646,8 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
match &path[..] {
// Allocators are magic. They have no MIR, even when the rest of libstd does.
"alloc::alloc::::__rust_alloc" => {
let size = self.value_to_scalar(args[0])?.to_u64()?;
let align = self.value_to_scalar(args[1])?.to_u64()?;
let size = self.value_to_scalar(args[0])?.to_usize(self)?;
let align = self.value_to_scalar(args[1])?.to_usize(self)?;
if size == 0 {
return err!(HeapAllocZeroBytes);
}
@ -660,8 +660,8 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
self.write_scalar(dest, Scalar::Ptr(ptr), dest_ty)?;
}
"alloc::alloc::::__rust_alloc_zeroed" => {
let size = self.value_to_scalar(args[0])?.to_u64()?;
let align = self.value_to_scalar(args[1])?.to_u64()?;
let size = self.value_to_scalar(args[0])?.to_usize(self)?;
let align = self.value_to_scalar(args[1])?.to_usize(self)?;
if size == 0 {
return err!(HeapAllocZeroBytes);
}
@ -676,8 +676,8 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
}
"alloc::alloc::::__rust_dealloc" => {
let ptr = self.into_ptr(args[0].value)?.to_ptr()?;
let old_size = self.value_to_scalar(args[1])?.to_u64()?;
let align = self.value_to_scalar(args[2])?.to_u64()?;
let old_size = self.value_to_scalar(args[1])?.to_usize(self)?;
let align = self.value_to_scalar(args[2])?.to_usize(self)?;
if old_size == 0 {
return err!(HeapAllocZeroBytes);
}
@ -692,9 +692,9 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
}
"alloc::alloc::::__rust_realloc" => {
let ptr = self.into_ptr(args[0].value)?.to_ptr()?;
let old_size = self.value_to_scalar(args[1])?.to_u64()?;
let align = self.value_to_scalar(args[2])?.to_u64()?;
let new_size = self.value_to_scalar(args[3])?.to_u64()?;
let old_size = self.value_to_scalar(args[1])?.to_usize(self)?;
let align = self.value_to_scalar(args[2])?.to_usize(self)?;
let new_size = self.value_to_scalar(args[3])?.to_usize(self)?;
if old_size == 0 || new_size == 0 {
return err!(HeapAllocZeroBytes);
}

6
src/lib.rs
View file

@ -62,7 +62,7 @@ pub trait ScalarExt {
fn from_isize(i: i64, ptr_size: Size) -> Self;
fn from_f32(f: f32) -> Self;
fn from_f64(f: f64) -> Self;
fn to_u64(self) -> EvalResult<'static, u64>;
fn to_usize<'a, 'mir, 'tcx>(self, ecx: &rustc_mir::interpret::EvalContext<'a, 'mir, 'tcx, Evaluator<'tcx>>) -> EvalResult<'static, u64>;
fn is_null(self) -> EvalResult<'static, bool>;
/// HACK: this function just extracts all bits if `defined != 0`
/// Mainly used for args of C-functions and we should totally correctly fetch the size
@ -103,8 +103,8 @@ impl ScalarExt for Scalar {
Scalar::Bits { bits: f.to_bits() as u128, defined: 64 }
}
fn to_u64(self) -> EvalResult<'static, u64> {
let b = self.to_bits(Size::from_bits(64))?;
fn to_usize<'a, 'mir, 'tcx>(self, ecx: &rustc_mir::interpret::EvalContext<'a, 'mir, 'tcx, Evaluator<'tcx>>) -> EvalResult<'static, u64> {
let b = self.to_bits(ecx.memory.pointer_size())?;
assert_eq!(b as u64 as u128, b);
Ok(b as u64)
}

2
src/validation.rs
View file

@ -119,7 +119,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
Index(v) => {
let value = self.frame().get_local(v)?;
let ty = self.tcx.tcx.types.usize;
let n = self.value_to_scalar(ValTy { value, ty })?.to_u64()?;
let n = self.value_to_scalar(ValTy { value, ty })?.to_usize(self)?;
Index(n)
},
ConstantIndex { offset, min_length, from_end } =>