Assert that LLVM range-attribute values don't exceed 128 bits
The underlying implementation of `LLVMCreateConstantRangeAttribute` assumes that each of `LowerWords` and `UpperWords` points to enough u64 values to define an integer of the specified bit-length, and will encounter UB if that is not the case. Our safe wrapper function always passes pointers to `[u64; 2]` arrays, regardless of the bit-length specified. That's fine in practice, because scalar primitives never exceed 128 bits, but it is technically a soundness hole in a safe function. We can close the soundness hole by explicitly asserting `size_bits <= 128`. This is effectively just a stricter version of the existing check that the value must be small enough to fit in `c_uint`.
This commit is contained in:
@@ -1929,11 +1929,17 @@ unsafe extern "C" {
|
||||
C: &Context,
|
||||
effects: MemoryEffects,
|
||||
) -> &Attribute;
|
||||
/// ## Safety
|
||||
/// - Each of `LowerWords` and `UpperWords` must point to an array that is
|
||||
/// long enough to fully define an integer of size `NumBits`, i.e. each
|
||||
/// pointer must point to `NumBits.div_ceil(64)` elements or more.
|
||||
/// - The implementation will make its own copy of the pointed-to `u64`
|
||||
/// values, so the pointers only need to outlive this function call.
|
||||
pub(crate) fn LLVMRustCreateRangeAttribute(
|
||||
C: &Context,
|
||||
num_bits: c_uint,
|
||||
lower_words: *const u64,
|
||||
upper_words: *const u64,
|
||||
NumBits: c_uint,
|
||||
LowerWords: *const u64,
|
||||
UpperWords: *const u64,
|
||||
) -> &Attribute;
|
||||
|
||||
// Operations on functions
|
||||
|
||||
@@ -112,16 +112,26 @@ pub(crate) fn CreateAllocKindAttr(llcx: &Context, kind_arg: AllocKindFlags) -> &
|
||||
|
||||
pub(crate) fn CreateRangeAttr(llcx: &Context, size: Size, range: WrappingRange) -> &Attribute {
|
||||
let lower = range.start;
|
||||
// LLVM treats the upper bound as exclusive, but allows wrapping.
|
||||
let upper = range.end.wrapping_add(1);
|
||||
let lower_words = [lower as u64, (lower >> 64) as u64];
|
||||
let upper_words = [upper as u64, (upper >> 64) as u64];
|
||||
|
||||
// Pass each `u128` endpoint value as a `[u64; 2]` array, least-significant part first.
|
||||
let as_u64_array = |x: u128| [x as u64, (x >> 64) as u64];
|
||||
let lower_words: [u64; 2] = as_u64_array(lower);
|
||||
let upper_words: [u64; 2] = as_u64_array(upper);
|
||||
|
||||
// To ensure that LLVM doesn't try to read beyond the `[u64; 2]` arrays,
|
||||
// we must explicitly check that `size_bits` does not exceed 128.
|
||||
let size_bits = size.bits();
|
||||
assert!(size_bits <= 128);
|
||||
// More robust assertions that are redundant with `size_bits <= 128` and
|
||||
// should be optimized away.
|
||||
assert!(size_bits.div_ceil(64) <= u64::try_from(lower_words.len()).unwrap());
|
||||
assert!(size_bits.div_ceil(64) <= u64::try_from(upper_words.len()).unwrap());
|
||||
let size_bits = c_uint::try_from(size_bits).unwrap();
|
||||
|
||||
unsafe {
|
||||
LLVMRustCreateRangeAttribute(
|
||||
llcx,
|
||||
size.bits().try_into().unwrap(),
|
||||
lower_words.as_ptr(),
|
||||
upper_words.as_ptr(),
|
||||
)
|
||||
LLVMRustCreateRangeAttribute(llcx, size_bits, lower_words.as_ptr(), upper_words.as_ptr())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user