| Message ID | 20221018090406.never.856-kees@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6fcd7e702d3d91cc2c3194acffd7d67b2c10b81f |
| Headers | show |
| Series | devres: Use kmalloc_size_roundup() to match ksize() usage | expand |
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; }
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 <gregkh@linuxfoundation.org> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/base/devres.c | 3 +++ 1 file changed, 3 insertions(+)