diff options
| author |  Kees Cook <keescook@chromium.org>
| 2022-10-18 02:10:11 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org>
| 2022-11-01 10:04:52 -0700 |
| commit | cd536db050993f7c220a6cfb01de5356032b6f8e (patch) | |
| tree | 49c4192cadee75f637b2251d2cb15b0453c79745 | |
| parent | kbuild: upgrade the orphan section warning to an error if CONFIG_WERROR is set (diff) | |
| download | linux-cd536db050993f7c220a6cfb01de5356032b6f8e.tar.gz linux-cd536db050993f7c220a6cfb01de5356032b6f8e.tar.bz2 linux-cd536db050993f7c220a6cfb01de5356032b6f8e.zip | |
dma-buf: Proactively round up to kmalloc bucket size
Instead of discovering the kmalloc bucket size _after_ allocation, round
up proactively so the allocation is explicitly made for the full size,
allowing the compiler to correctly reason about the resulting size of
the buffer through the existing __alloc_size() hint.
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: linux-media@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linaro-mm-sig@lists.linaro.org
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221018090858.never.941-kees@kernel.org
| -rw-r--r-- | drivers/dma-buf/dma-resv.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index e3885c90a3ac..1c76aed8e262 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -98,12 +98,17 @@ static void dma_resv_list_set(struct dma_resv_list *list, static struct dma_resv_list *dma_resv_list_alloc(unsigned int max_fences) { struct dma_resv_list *list; + size_t size; - list = kmalloc(struct_size(list, table, max_fences), GFP_KERNEL); + /* Round up to the next kmalloc bucket size. */ + size = kmalloc_size_roundup(struct_size(list, table, max_fences)); + + list = kmalloc(size, GFP_KERNEL); if (!list) return NULL; - list->max_fences = (ksize(list) - offsetof(typeof(*list), table)) / + /* Given the resulting bucket size, recalculated max_fences. */ + list->max_fences = (size - offsetof(typeof(*list), table)) / sizeof(*list->table); return list; |