From df88d53c3bfe8456e07f2c8a02cccc7d85d9582e Mon Sep 17 00:00:00 2001 From: Mark Langsdorf Date: Tue, 14 Mar 2023 15:54:30 -0400 Subject: [PATCH] devres: Use kmalloc_size_roundup() to match ksize() usage Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2178302 commit 6fcd7e702d3d91cc2c3194acffd7d67b2c10b81f Author: Kees Cook Date: Tue, 18 Oct 2022 02:04:10 -0700 Round up allocations with kmalloc_size_roundup() so that devres's use of ksize() is always accurate and no special handling of the memory is needed by KASAN, UBSAN_BOUNDS, nor FORTIFY_SOURCE. Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20221018090406.never.856-kees@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Mark Langsdorf --- drivers/base/devres.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 4ab2b50ee38f..c0e100074aa3 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -101,6 +101,9 @@ static bool check_dr_size(size_t size, size_t *tot_size) size, tot_size))) return false; + /* Actually allocate the full kmalloc bucket size. */ + *tot_size = kmalloc_size_roundup(*tot_size); + return true; }