]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
dmaengine: timb_dma: Use struct_size() in kzalloc()
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Tue, 8 Jan 2019 15:58:52 +0000 (09:58 -0600)
committerVinod Koul <vkoul@kernel.org>
Sun, 20 Jan 2019 05:20:07 +0000 (10:50 +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/timb_dma.c

index fc0f9c8766a87c35c17b7e42e95d1ca2db7fd20a..afbb1c95b721b3a68f49a3c63d30b3e4d6bfe99e 100644 (file)
@@ -643,8 +643,8 @@ static int td_probe(struct platform_device *pdev)
                DRIVER_NAME))
                return -EBUSY;
 
-       td  = kzalloc(sizeof(struct timb_dma) +
-               sizeof(struct timb_dma_chan) * pdata->nr_channels, GFP_KERNEL);
+       td  = kzalloc(struct_size(td, channels, pdata->nr_channels),
+                     GFP_KERNEL);
        if (!td) {
                err = -ENOMEM;
                goto err_release_region;