Commit 682591f7 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by David S. Miller
Browse files

liquidio: Replace vmalloc_node + memset with vzalloc_node and use array_size 

Use vzalloc/vzalloc_node instead of the vmalloc/vzalloc_node and memset.

Also, notice that vzalloc_node() function has no 2-factor argument form
to calculate the size for the allocation, so multiplication factors need
to be wrapped in array_size().

This issue was found with the help of Coccinelle and, audited and fixed
manually.

Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83


Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cad2929d

drivers/net/ethernet/cavium/liquidio/request_manager.c

+3 −7
Original line number Diff line number Diff line
@@ -95,12 +95,10 @@ int octeon_init_instr_queue(struct octeon_device *oct, 
	/* Initialize a list to holds requests that have been posted to Octeon

	 * but has yet to be fetched by octeon

	 */

	iq->request_list = vmalloc_node((sizeof(*iq->request_list) * num_descs),

	iq->request_list = vzalloc_node(array_size(num_descs, sizeof(*iq->request_list)),

					numa_node);

	if (!iq->request_list)

		iq->request_list =

			vmalloc(array_size(num_descs,

					   sizeof(*iq->request_list)));

		iq->request_list = vzalloc(array_size(num_descs, sizeof(*iq->request_list)));

	if (!iq->request_list) {

		lio_dma_free(oct, q_size, iq->base_addr, iq->base_addr_dma);

		dev_err(&oct->pci_dev->dev, "Alloc failed for IQ[%d] nr free list\n",
@@ -108,8 +106,6 @@ int octeon_init_instr_queue(struct octeon_device *oct, 
		return 1;

	}



	memset(iq->request_list, 0, sizeof(*iq->request_list) * num_descs);



	dev_dbg(&oct->pci_dev->dev, "IQ[%d]: base: %p basedma: %pad count: %d\n",

		iq_no, iq->base_addr, &iq->base_addr_dma, iq->max_count);

CRA Git | Maintained and supported by SUSTech CRA and CCSE