]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: qcom: bam_dma: use struct_size() in kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Fri, 4 Jan 2019 17:32:15 +0000 (11:32 -0600)
committerVinod Koul <vkoul@kernel.org>
Mon, 7 Jan 2019 12:37:21 +0000 (18:07 +0530)
One of the more common cases of allocation size calculations is finding the
size of a structure that has a zero-sized array at the end, along with memory
for some number of elements for that array. For example:

struct foo {
    int stuff;
    void *entry[];
};

instance = kzalloc(sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);

Instead of leaving these open-coded and prone to type mistakes, we can now
use the new struct_size() helper:

instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL);

This code was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/qcom/bam_dma.c

index 1617715aa6e072616374bfbb45089f4b119ad9c6..cb860cb53c27476386ec0609b5281d03de3f563c 100644 (file)
@@ -636,8 +636,8 @@ static struct dma_async_tx_descriptor *bam_prep_slave_sg(struct dma_chan *chan,
                num_alloc += DIV_ROUND_UP(sg_dma_len(sg), BAM_FIFO_SIZE);
 
        /* allocate enough room to accomodate the number of entries */
-       async_desc = kzalloc(sizeof(*async_desc) +
-                       (num_alloc * sizeof(struct bam_desc_hw)), GFP_NOWAIT);
+       async_desc = kzalloc(struct_size(async_desc, desc, num_alloc),
+                            GFP_NOWAIT);
 
        if (!async_desc)
                goto err_out;