Commit 9d922f5d authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Jakub Kicinski
Browse files

net: huawei: hinic: Use devm_kcalloc() instead of devm_kzalloc() 

Use 2-factor multiplication argument form devm_kcalloc() instead
of devm_kzalloc().

Link: https://github.com/KSPP/linux/issues/162


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20211208040311.GA169838@embeddedor


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d7ca9a34

drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c

+2 −3
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ static int api_chain_init(struct hinic_api_cmd_chain *chain, 
{

	struct hinic_hwif *hwif = attr->hwif;

	struct pci_dev *pdev = hwif->pdev;

	size_t cell_ctxt_size;



	chain->hwif = hwif;

	chain->chain_type  = attr->chain_type;
@@ -826,8 +825,8 @@ static int api_chain_init(struct hinic_api_cmd_chain *chain, 


	sema_init(&chain->sem, 1);



	cell_ctxt_size = chain->num_cells * sizeof(*chain->cell_ctxt);

	chain->cell_ctxt = devm_kzalloc(&pdev->dev, cell_ctxt_size, GFP_KERNEL);

	chain->cell_ctxt = devm_kcalloc(&pdev->dev, chain->num_cells,

					sizeof(*chain->cell_ctxt), GFP_KERNEL);

	if (!chain->cell_ctxt)

		return -ENOMEM;

drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c

+4 −6
Original line number Diff line number Diff line
@@ -796,11 +796,10 @@ static int init_cmdqs_ctxt(struct hinic_hwdev *hwdev, 
	struct hinic_cmdq_ctxt *cmdq_ctxts;

	struct pci_dev *pdev = hwif->pdev;

	struct hinic_pfhwdev *pfhwdev;

	size_t cmdq_ctxts_size;

	int err;



	cmdq_ctxts_size = HINIC_MAX_CMDQ_TYPES * sizeof(*cmdq_ctxts);

	cmdq_ctxts = devm_kzalloc(&pdev->dev, cmdq_ctxts_size, GFP_KERNEL);

	cmdq_ctxts = devm_kcalloc(&pdev->dev, HINIC_MAX_CMDQ_TYPES,

				  sizeof(*cmdq_ctxts), GFP_KERNEL);

	if (!cmdq_ctxts)

		return -ENOMEM;
@@ -884,7 +883,6 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif, 
	struct hinic_func_to_io *func_to_io = cmdqs_to_func_to_io(cmdqs);

	struct pci_dev *pdev = hwif->pdev;

	struct hinic_hwdev *hwdev;

	size_t saved_wqs_size;

	u16 max_wqe_size;

	int err;
@@ -895,8 +893,8 @@ int hinic_init_cmdqs(struct hinic_cmdqs *cmdqs, struct hinic_hwif *hwif, 
	if (!cmdqs->cmdq_buf_pool)

		return -ENOMEM;



	saved_wqs_size = HINIC_MAX_CMDQ_TYPES * sizeof(struct hinic_wq);

	cmdqs->saved_wqs = devm_kzalloc(&pdev->dev, saved_wqs_size, GFP_KERNEL);

	cmdqs->saved_wqs = devm_kcalloc(&pdev->dev, HINIC_MAX_CMDQ_TYPES,

					sizeof(*cmdqs->saved_wqs), GFP_KERNEL);

	if (!cmdqs->saved_wqs) {

		err = -ENOMEM;

		goto err_saved_wqs;

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c

+2 −3
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int init_msix(struct hinic_hwdev *hwdev) 
	struct hinic_hwif *hwif = hwdev->hwif;

	struct pci_dev *pdev = hwif->pdev;

	int nr_irqs, num_aeqs, num_ceqs;

	size_t msix_entries_size;

	int i, err;



	num_aeqs = HINIC_HWIF_NUM_AEQS(hwif);
@@ -171,8 +170,8 @@ static int init_msix(struct hinic_hwdev *hwdev) 
	if (nr_irqs > HINIC_HWIF_NUM_IRQS(hwif))

		nr_irqs = HINIC_HWIF_NUM_IRQS(hwif);



	msix_entries_size = nr_irqs * sizeof(*hwdev->msix_entries);

	hwdev->msix_entries = devm_kzalloc(&pdev->dev, msix_entries_size,

	hwdev->msix_entries = devm_kcalloc(&pdev->dev, nr_irqs,

					   sizeof(*hwdev->msix_entries),

					   GFP_KERNEL);

	if (!hwdev->msix_entries)

		return -ENOMEM;

drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c

+4 −5
Original line number Diff line number Diff line
@@ -631,16 +631,15 @@ static int alloc_eq_pages(struct hinic_eq *eq) 
	struct hinic_hwif *hwif = eq->hwif;

	struct pci_dev *pdev = hwif->pdev;

	u32 init_val, addr, val;

	size_t addr_size;

	int err, pg;



	addr_size = eq->num_pages * sizeof(*eq->dma_addr);

	eq->dma_addr = devm_kzalloc(&pdev->dev, addr_size, GFP_KERNEL);

	eq->dma_addr = devm_kcalloc(&pdev->dev, eq->num_pages,

				    sizeof(*eq->dma_addr), GFP_KERNEL);

	if (!eq->dma_addr)

		return -ENOMEM;



	addr_size = eq->num_pages * sizeof(*eq->virt_addr);

	eq->virt_addr = devm_kzalloc(&pdev->dev, addr_size, GFP_KERNEL);

	eq->virt_addr = devm_kcalloc(&pdev->dev, eq->num_pages,

				     sizeof(*eq->virt_addr), GFP_KERNEL);

	if (!eq->virt_addr) {

		err = -ENOMEM;

		goto err_virt_addr_alloc;

drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c

+11 −12
Original line number Diff line number Diff line
@@ -193,20 +193,20 @@ static int alloc_page_arrays(struct hinic_wqs *wqs) 
{

	struct hinic_hwif *hwif = wqs->hwif;

	struct pci_dev *pdev = hwif->pdev;

	size_t size;



	size = wqs->num_pages * sizeof(*wqs->page_paddr);

	wqs->page_paddr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);

	wqs->page_paddr = devm_kcalloc(&pdev->dev, wqs->num_pages,

				       sizeof(*wqs->page_paddr), GFP_KERNEL);

	if (!wqs->page_paddr)

		return -ENOMEM;



	size = wqs->num_pages * sizeof(*wqs->page_vaddr);

	wqs->page_vaddr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);

	wqs->page_vaddr = devm_kcalloc(&pdev->dev, wqs->num_pages,

				       sizeof(*wqs->page_vaddr), GFP_KERNEL);

	if (!wqs->page_vaddr)

		goto err_page_vaddr;



	size = wqs->num_pages * sizeof(*wqs->shadow_page_vaddr);

	wqs->shadow_page_vaddr = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);

	wqs->shadow_page_vaddr = devm_kcalloc(&pdev->dev, wqs->num_pages,

					      sizeof(*wqs->shadow_page_vaddr),

					      GFP_KERNEL);

	if (!wqs->shadow_page_vaddr)

		goto err_page_shadow_vaddr;
@@ -379,15 +379,14 @@ static int alloc_wqes_shadow(struct hinic_wq *wq) 
{

	struct hinic_hwif *hwif = wq->hwif;

	struct pci_dev *pdev = hwif->pdev;

	size_t size;



	size = wq->num_q_pages * wq->max_wqe_size;

	wq->shadow_wqe = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);

	wq->shadow_wqe = devm_kcalloc(&pdev->dev, wq->num_q_pages,

				      wq->max_wqe_size, GFP_KERNEL);

	if (!wq->shadow_wqe)

		return -ENOMEM;



	size = wq->num_q_pages * sizeof(wq->prod_idx);

	wq->shadow_idx = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);

	wq->shadow_idx = devm_kcalloc(&pdev->dev, wq->num_q_pages,

				      sizeof(wq->prod_idx), GFP_KERNEL);

	if (!wq->shadow_idx)

		goto err_shadow_idx;