Commit 06665619 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jeff Kirsher

iavf: 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 = kzalloc(size, 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)

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

This code was detected with the help of Coccinelle.
Signed-off-by: default avatar"Gustavo A. R. Silva" <gustavo@embeddedor.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6b6b49b5
...@@ -3353,7 +3353,7 @@ static void iavf_init_task(struct work_struct *work) ...@@ -3353,7 +3353,7 @@ static void iavf_init_task(struct work_struct *work)
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct iavf_hw *hw = &adapter->hw; struct iavf_hw *hw = &adapter->hw;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
int err, bufsz; int err;
switch (adapter->state) { switch (adapter->state) {
case __IAVF_STARTUP: case __IAVF_STARTUP:
...@@ -3423,10 +3423,9 @@ static void iavf_init_task(struct work_struct *work) ...@@ -3423,10 +3423,9 @@ static void iavf_init_task(struct work_struct *work)
case __IAVF_INIT_GET_RESOURCES: case __IAVF_INIT_GET_RESOURCES:
/* aq msg sent, awaiting reply */ /* aq msg sent, awaiting reply */
if (!adapter->vf_res) { if (!adapter->vf_res) {
bufsz = sizeof(struct virtchnl_vf_resource) + adapter->vf_res = kzalloc(struct_size(adapter->vf_res,
(IAVF_MAX_VF_VSI * vsi_res, IAVF_MAX_VF_VSI),
sizeof(struct virtchnl_vsi_resource)); GFP_KERNEL);
adapter->vf_res = kzalloc(bufsz, GFP_KERNEL);
if (!adapter->vf_res) if (!adapter->vf_res)
goto err; goto err;
} }
......
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