bnx2x: Use kcalloc instead of kzalloc to allocate array
authorThomas Meyer <thomas@m3y3r.de>
Tue, 29 Nov 2011 11:08:00 +0000 (11:08 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 4 Dec 2011 06:32:05 +0000 (01:32 -0500)
The advantage of kcalloc is, that will prevent integer overflows which could
result from the multiplication of number of elements and size and it is also
a bit nicer to read.

The semantic patch that makes this change is available
in https://lkml.org/lkml/2011/11/25/107

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c

index 79695bb034d665b8b3ec4981859de87844bb1ac4..477bc9713a669e8349220f2c1ca56728ee7e52de 100644 (file)
@@ -3300,14 +3300,14 @@ int __devinit bnx2x_alloc_mem_bp(struct bnx2x *bp)
        msix_table_size = bp->igu_sb_cnt + 1;
 
        /* fp array: RSS plus CNIC related L2 queues */
-       fp = kzalloc((BNX2X_MAX_RSS_COUNT(bp) + NON_ETH_CONTEXT_USE) *
+       fp = kcalloc(BNX2X_MAX_RSS_COUNT(bp) + NON_ETH_CONTEXT_USE,
                     sizeof(*fp), GFP_KERNEL);
        if (!fp)
                goto alloc_err;
        bp->fp = fp;
 
        /* msix table */
-       tbl = kzalloc(msix_table_size * sizeof(*tbl), GFP_KERNEL);
+       tbl = kcalloc(msix_table_size, sizeof(*tbl), GFP_KERNEL);
        if (!tbl)
                goto alloc_err;
        bp->msix_table = tbl;
index 14517691f8dbe9a759abe26a7e5f5debd2515eb4..a34362e9fd9c305c922afc3c67d5388f6cd23b4e 100644 (file)
@@ -3342,7 +3342,7 @@ static inline int bnx2x_mcast_refresh_registry_e1(struct bnx2x *bp,
                if (!list_empty(&o->registry.exact_match.macs))
                        return 0;
 
-               elem = kzalloc(sizeof(*elem)*len, GFP_ATOMIC);
+               elem = kcalloc(len, sizeof(*elem), GFP_ATOMIC);
                if (!elem) {
                        BNX2X_ERR("Failed to allocate registry memory\n");
                        return -ENOMEM;