| Message ID | 20190619140227.GA9877@embeddedor (mailing list archive) |
|---|---|
| State | Deferred |
| Headers | show |
| Series | scsi: mvsas: Use struct_size() in kzalloc() | expand |
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c index da719b0694dc..3f2022fd2335 100644 --- a/drivers/scsi/mvsas/mv_init.c +++ b/drivers/scsi/mvsas/mv_init.c @@ -350,9 +350,9 @@ static struct mvs_info *mvs_pci_alloc(struct pci_dev *pdev, struct mvs_info *mvi = NULL; struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); - mvi = kzalloc(sizeof(*mvi) + - (1L << mvs_chips[ent->driver_data].slot_width) * - sizeof(struct mvs_slot_info), GFP_KERNEL); + mvi = kzalloc(struct_size(mvi, slot_info, + 1L << mvs_chips[ent->driver_data].slot_width), + GFP_KERNEL); if (!mvi) return NULL;
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 mvs_info { ... struct mvs_slot_info slot_info[0]; }; instance = kzalloc(sizeof(sizeof(*mvi) + count * sizeof(struct mvs_slot_info), 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(mvi, slot_info, count), GFP_KERNEL); This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/scsi/mvsas/mv_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)