Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1624716
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 21/25] net: pxa168_eth: Use kcalloc() in two functions |
| Date | 2017-04-17 17:40 +0200 |
| Message-ID | <txgUV-2mc-13@gated-at.bofh.it> (permalink) |
| References | <txgrT-2bp-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Mon, 17 Apr 2017 14:32:14 +0200 Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus use the corresponding function "kcalloc". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/net/ethernet/marvell/pxa168_eth.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 28cb36d9e50a..2404eac51c63 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -1036,8 +1036,7 @@ static int rxq_init(struct net_device *dev) int rx_desc_num = pep->rx_ring_size; /* Allocate RX skb rings */ - pep->rx_skb = kzalloc(sizeof(*pep->rx_skb) * pep->rx_ring_size, - GFP_KERNEL); + pep->rx_skb = kcalloc(rx_desc_num, sizeof(*pep->rx_skb), GFP_KERNEL); if (!pep->rx_skb) return -ENOMEM; @@ -1096,8 +1095,7 @@ static int txq_init(struct net_device *dev) int size = 0, i = 0; int tx_desc_num = pep->tx_ring_size; - pep->tx_skb = kzalloc(sizeof(*pep->tx_skb) * pep->tx_ring_size, - GFP_KERNEL); + pep->tx_skb = kcalloc(tx_desc_num, sizeof(*pep->tx_skb), GFP_KERNEL); if (!pep->tx_skb) return -ENOMEM; -- 2.12.2
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/25] Ethernet-Marvell: Fine-tuning for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:10 +0200 [PATCH 02/25] net: mvneta: Improve two size determinations in mvneta_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 03/25] net: mvneta: Use kmalloc_array() in mvneta_txq_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 08/25] net: mvpp2: Improve another size determination in mvpp2_port_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 05/25] net: mvpp2: Use kmalloc_array() in mvpp2_txq_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 04/25] net: mvneta: Adjust six checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 06/25] net: mvpp2: Improve two size determinations in mvpp2_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 07/25] net: mvpp2: Improve another size determination in mvpp2_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 09/25] net: mvpp2: Improve another size determination in mvpp2_bm_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:20 +0200 [PATCH 19/25] net: mvpp2: Rename a jump label in mvpp2_prs_vlan_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 17/25] net: mvpp2: Rename a jump label in mvpp2_txq_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 12/25] net: mvpp2: Improve a size determination in two functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 18/25] net: mvpp2: Rename a jump label in mvpp2_prs_double_vlan_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 11/25] net: mvpp2: Improve 27 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 10/25] net: mvpp2: Improve another size determination in mvpp2_prs_default_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 13/25] net: mvpp2: Fix a jump label position in mvpp2_rx() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 14/25] net: mvpp2: Rename a jump label in two functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 15/25] net: mvpp2: Adjust three error messages SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 16/25] net: mvpp2: Rename a jump label in mvpp2_tx_frag_process() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:30 +0200 [PATCH 22/25] net: pxa168_eth: Adjust four checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:40 +0200 [PATCH 21/25] net: pxa168_eth: Use kcalloc() in two functions SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:40 +0200 [PATCH 24/25] skge: Adjust a null pointer check in skge_down() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:40 +0200 [PATCH 20/25] net: mvpp2: Adjust a null pointer check in mvpp2_egress_enable() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:40 +0200 [PATCH 23/25] skge: Use seq_puts() in skge_debug_show() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:40 +0200 [PATCH 25/25] sky2: Use seq_puts() in sky2_debug_show() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-17 17:40 +0200 Re: [PATCH 00/25] Ethernet-Marvell: Fine-tuning for several function implementations David Miller <davem@davemloft.net> - 2017-04-18 20:10 +0200
csiph-web