From: Rick Farrington <ricardo.farring...@cavium.com>

For defensive programming, zero the allocated block 'oct->droq[0]' in
octeon_setup_output_queues() and 'oct->instr_queue[0]' in
octeon_setup_instr_queues().

Signed-off-by: Rick Farrington <ricardo.farring...@cavium.com>
Signed-off-by: Satanand Burla <satananda.bu...@cavium.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsav...@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlu...@cavium.com>
---
 drivers/net/ethernet/cavium/liquidio/octeon_device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c 
b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
index 623e28c..f10014f7 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
@@ -876,11 +876,11 @@ int octeon_setup_instr_queues(struct octeon_device *oct)
 
        oct->num_iqs = 0;
 
-       oct->instr_queue[0] = vmalloc_node(sizeof(*oct->instr_queue[0]),
+       oct->instr_queue[0] = vzalloc_node(sizeof(*oct->instr_queue[0]),
                                numa_node);
        if (!oct->instr_queue[0])
                oct->instr_queue[0] =
-                       vmalloc(sizeof(struct octeon_instr_queue));
+                       vzalloc(sizeof(struct octeon_instr_queue));
        if (!oct->instr_queue[0])
                return 1;
        memset(oct->instr_queue[0], 0, sizeof(struct octeon_instr_queue));
@@ -923,9 +923,9 @@ int octeon_setup_output_queues(struct octeon_device *oct)
                desc_size = CFG_GET_DEF_RX_BUF_SIZE(CHIP_CONF(oct, cn23xx_vf));
        }
        oct->num_oqs = 0;
-       oct->droq[0] = vmalloc_node(sizeof(*oct->droq[0]), numa_node);
+       oct->droq[0] = vzalloc_node(sizeof(*oct->droq[0]), numa_node);
        if (!oct->droq[0])
-               oct->droq[0] = vmalloc(sizeof(*oct->droq[0]));
+               oct->droq[0] = vzalloc(sizeof(*oct->droq[0]));
        if (!oct->droq[0])
                return 1;
 
-- 
2.9.0

Reply via email to