Commit f39a97d0 authored by Boqun Feng's avatar Boqun Feng Committed by Miguel Ojeda
Browse files

rust: allocator: Use krealloc_aligned() in KernelAllocator::alloc 



This fixes the potential issue that when KernelAllocator is used, the
allocation may be mis-aligned due to SLAB's alignment guarantee.

Signed-off-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Reviewed-by: default avatarAndreas Hindborg <a.hindborg@samsung.com>
Link: https://lore.kernel.org/r/20230730012905.643822-3-boqun.feng@gmail.com


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 917b2e00

rust/kernel/allocator.rs

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ unsafe fn krealloc_aligned(ptr: *mut u8, new_layout: Layout, flags: bindings::gf 


unsafe impl GlobalAlloc for KernelAllocator {

    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {

        // `krealloc()` is used instead of `kmalloc()` because the latter is

        // an inline function and cannot be bound to as a result.

        unsafe { bindings::krealloc(ptr::null(), layout.size(), bindings::GFP_KERNEL) as *mut u8 }

        // SAFETY: `ptr::null_mut()` is null and `layout` has a non-zero size by the function safety

        // requirement.

        unsafe { krealloc_aligned(ptr::null_mut(), layout, bindings::GFP_KERNEL) }

    }



    unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {