mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-28 16:53:49 +00:00
rust: alloc: Fix ArrayLayout
allocations
We were accidentally allocating a layout for the *square* of the object
size due to a variable shadowing mishap.
Fixes memory bloat and page allocation failures in drm/asahi.
Reported-by: Janne Grunau <j@jannau.net>
Fixes: 9e7bbfa182
("rust: alloc: introduce `ArrayLayout`")
Signed-off-by: Asahi Lina <lina@asahilina.net>
Acked-by: Danilo Krummrich <dakr@kernel.org>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Link: https://lore.kernel.org/r/20241123-rust-fix-arraylayout-v1-1-197e64c95bd4@asahilina.net
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
parent
b160dc46dd
commit
b7ed2b6f4e
@ -45,7 +45,7 @@ pub const fn empty() -> Self {
|
||||
/// When `len * size_of::<T>()` overflows or when `len * size_of::<T>() > isize::MAX`.
|
||||
pub const fn new(len: usize) -> Result<Self, LayoutError> {
|
||||
match len.checked_mul(core::mem::size_of::<T>()) {
|
||||
Some(len) if len <= ISIZE_MAX => {
|
||||
Some(size) if size <= ISIZE_MAX => {
|
||||
// INVARIANT: We checked above that `len * size_of::<T>() <= isize::MAX`.
|
||||
Ok(Self {
|
||||
len,
|
||||
|
Loading…
Reference in New Issue
Block a user