evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: sxgbe: Fix waring for double kfree()

Browse source 
This patch fixes double kfree() calls at init_rx_ring() because
it causes static checker warning.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Byungho An <bh74.an@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Byungho An 2015-01-15 10:43:11 +09:00 • committed by David S. Miller
parent 1c1832c7cd
commit f7d855566f
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c
View file

@ -474,13 +474,19 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
/* allocate memory for RX skbuff array */ /* allocate memory for RX skbuff array */
rx_ring->rx_skbuff_dma = kmalloc_array(rx_rsize, rx_ring->rx_skbuff_dma = kmalloc_array(rx_rsize,
sizeof(dma_addr_t), GFP_KERNEL); sizeof(dma_addr_t), GFP_KERNEL);
if (rx_ring->rx_skbuff_dma == NULL) if (!rx_ring->rx_skbuff_dma) {
goto dmamem_err; dma_free_coherent(priv->device,
rx_rsize * sizeof(struct sxgbe_rx_norm_desc),
rx_ring->dma_rx, rx_ring->dma_rx_phy);
goto error;
}
rx_ring->rx_skbuff = kmalloc_array(rx_rsize, rx_ring->rx_skbuff = kmalloc_array(rx_rsize,
sizeof(struct sk_buff *), GFP_KERNEL); sizeof(struct sk_buff *), GFP_KERNEL);
if (rx_ring->rx_skbuff == NULL) if (!rx_ring->rx_skbuff) {
goto rxbuff_err; kfree(rx_ring->rx_skbuff_dma);
goto error;
}
/* initialise the buffers */ /* initialise the buffers */
for (desc_index = 0; desc_index < rx_rsize; desc_index++) { for (desc_index = 0; desc_index < rx_rsize; desc_index++) {
@ -502,13 +508,6 @@ static int init_rx_ring(struct net_device *dev, u8 queue_no,
err_init_rx_buffers: err_init_rx_buffers:
while (--desc_index >= 0) while (--desc_index >= 0)
free_rx_ring(priv->device, rx_ring, desc_index); free_rx_ring(priv->device, rx_ring, desc_index);
kfree(rx_ring->rx_skbuff);
rxbuff_err:
kfree(rx_ring->rx_skbuff_dma);
dmamem_err:
dma_free_coherent(priv->device,
rx_rsize * sizeof(struct sxgbe_rx_norm_desc),
rx_ring->dma_rx, rx_ring->dma_rx_phy);
error: error:
return -ENOMEM; return -ENOMEM;
} }