Commit a3deec5b authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller

wan: wanxl: use struct_size() in kzalloc()

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;
    struct boo entry[];
};

size = sizeof(struct foo) + count * sizeof(struct boo);
instance = alloc(size, GFP_KERNEL)

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

instance = alloc(struct_size(instance, entry, count), GFP_KERNEL)

Notice that, in this case, variable alloc_size is not necessary, hence
it is removed.

This code was detected with the help of Coccinelle.
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd6d1226
...@@ -565,7 +565,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev, ...@@ -565,7 +565,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
u32 plx_phy; /* PLX PCI base address */ u32 plx_phy; /* PLX PCI base address */
u32 mem_phy; /* memory PCI base addr */ u32 mem_phy; /* memory PCI base addr */
u8 __iomem *mem; /* memory virtual base addr */ u8 __iomem *mem; /* memory virtual base addr */
int i, ports, alloc_size; int i, ports;
#ifndef MODULE #ifndef MODULE
pr_info_once("%s\n", version); pr_info_once("%s\n", version);
...@@ -601,8 +601,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev, ...@@ -601,8 +601,7 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
default: ports = 4; default: ports = 4;
} }
alloc_size = sizeof(struct card) + ports * sizeof(struct port); card = kzalloc(struct_size(card, ports, ports), GFP_KERNEL);
card = kzalloc(alloc_size, GFP_KERNEL);
if (card == NULL) { if (card == NULL) {
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment