]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: fsl-edma: use struct_size() in kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Fri, 4 Jan 2019 21:25:45 +0000 (15:25 -0600)
committerVinod Koul <vkoul@kernel.org>
Mon, 7 Jan 2019 12:38:17 +0000 (18:08 +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>
Tested-by: Angelo Dureghello <angelo@sysam.it>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/fsl-edma-common.c

index 8876c4c1bb2c0b49312df085a80225ae5d7b289e..fe529100674f6002370b51867e49b86bea42477a 100644 (file)
@@ -339,9 +339,7 @@ static struct fsl_edma_desc *fsl_edma_alloc_desc(struct fsl_edma_chan *fsl_chan,
        struct fsl_edma_desc *fsl_desc;
        int i;
 
-       fsl_desc = kzalloc(sizeof(*fsl_desc) +
-                          sizeof(struct fsl_edma_sw_tcd) *
-                          sg_len, GFP_NOWAIT);
+       fsl_desc = kzalloc(struct_size(fsl_desc, tcd, sg_len), GFP_NOWAIT);
        if (!fsl_desc)
                return NULL;