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: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c
index 6dd65f9b347cbc4573434385daaf5ad6e17e8be4..8e59c2825533a3c1e9c7ef04d537bcc8ed882265 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/request_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c
@@ -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),
-                                              numa_node);
+       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);