Commit 97ab3e8e authored by Danilo Krummrich's avatar Danilo Krummrich Committed by Miguel Ojeda

rust: alloc: fix dangling pointer in VecExt<T>::reserve()

Currently, a Vec<T>'s ptr value, after calling Vec<T>::new(), is
initialized to Unique::dangling(). Hence, in VecExt<T>::reserve(), we're
passing a dangling pointer (instead of NULL) to krealloc() whenever a new
Vec<T>'s backing storage is allocated through VecExt<T> extension
functions.

This only works as long as align_of::<T>(), used by Unique::dangling() to
derive the dangling pointer, resolves to a value between 0x0 and
ZERO_SIZE_PTR (0x10) and krealloc() hence treats it the same as a NULL
pointer however.

This isn't a case we should rely on, since there may be types whose
alignment may exceed the range still covered by krealloc(), plus other
kernel allocators are not as tolerant either.

Instead, pass a real NULL pointer to krealloc_aligned() if Vec<T>'s
capacity is zero.

Fixes: 5ab560ce ("rust: alloc: update `VecExt` to take allocation flags")
Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Reviewed-by: default avatarBenno Lossin <benno.lossin@proton.me>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Reviewed-by: default avatarWedson Almeida Filho <walmeida@microsoft.com>
Link: https://lore.kernel.org/r/20240501134834.22323-1-dakr@redhat.com
[ Solved `use` conflict and applied the `if`-instead-of-`match` change
  discussed in the list. - Miguel ]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 56f64b37
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
use super::{AllocError, Flags}; use super::{AllocError, Flags};
use alloc::vec::Vec; use alloc::vec::Vec;
use core::ptr;
/// Extensions to [`Vec`]. /// Extensions to [`Vec`].
pub trait VecExt<T>: Sized { pub trait VecExt<T>: Sized {
...@@ -134,14 +135,20 @@ fn reserve(&mut self, additional: usize, flags: Flags) -> Result<(), AllocError> ...@@ -134,14 +135,20 @@ fn reserve(&mut self, additional: usize, flags: Flags) -> Result<(), AllocError>
let new_cap = core::cmp::max(cap * 2, len.checked_add(additional).ok_or(AllocError)?); let new_cap = core::cmp::max(cap * 2, len.checked_add(additional).ok_or(AllocError)?);
let layout = core::alloc::Layout::array::<T>(new_cap).map_err(|_| AllocError)?; let layout = core::alloc::Layout::array::<T>(new_cap).map_err(|_| AllocError)?;
let (ptr, len, cap) = destructure(self); let (old_ptr, len, cap) = destructure(self);
// We need to make sure that `ptr` is either NULL or comes from a previous call to
// `krealloc_aligned`. A `Vec<T>`'s `ptr` value is not guaranteed to be NULL and might be
// dangling after being created with `Vec::new`. Instead, we can rely on `Vec<T>`'s capacity
// to be zero if no memory has been allocated yet.
let ptr = if cap == 0 { ptr::null_mut() } else { old_ptr };
// SAFETY: `ptr` is valid because it's either NULL or comes from a previous call to // SAFETY: `ptr` is valid because it's either NULL or comes from a previous call to
// `krealloc_aligned`. We also verified that the type is not a ZST. // `krealloc_aligned`. We also verified that the type is not a ZST.
let new_ptr = unsafe { super::allocator::krealloc_aligned(ptr.cast(), layout, flags) }; let new_ptr = unsafe { super::allocator::krealloc_aligned(ptr.cast(), layout, flags) };
if new_ptr.is_null() { if new_ptr.is_null() {
// SAFETY: We are just rebuilding the existing `Vec` with no changes. // SAFETY: We are just rebuilding the existing `Vec` with no changes.
unsafe { rebuild(self, ptr, len, cap) }; unsafe { rebuild(self, old_ptr, len, cap) };
Err(AllocError) Err(AllocError)
} else { } else {
// SAFETY: `ptr` has been reallocated with the layout for `new_cap` elements. New cap // SAFETY: `ptr` has been reallocated with the layout for `new_cap` elements. New cap
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment