diff options
| author |   Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2017-07-08 09:46:33 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-11 13:33:53 -0700 |
| commit | 63c3aa6b68782ee5ddb6588d95aacf1ab33e528b (patch) | |
| tree | c58722cb5897dbe9b3c4dd2b32599bf87bf85366 /drivers | |
| parent | cisco: enic: Fic an error handling path in 'vnic_dev_init_devcmd2()' (diff) | |
| download | linux-dev-63c3aa6b68782ee5ddb6588d95aacf1ab33e528b.tar.xz linux-dev-63c3aa6b68782ee5ddb6588d95aacf1ab33e528b.zip | |
net: stmmac: Fix error handling path in 'alloc_dma_rx_desc_resources()'
If the first 'kmalloc_array' within the loop fails, we should free what
as already been allocated, as done in all other error handling path.
Fixes: 54139cf3bb33 ("net: stmmac: adding multiple buffers for rx")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 19bba6281dab..4322fa4a13e8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1498,7 +1498,7 @@ static int alloc_dma_rx_desc_resources(struct stmmac_priv *priv) sizeof(dma_addr_t), GFP_KERNEL); if (!rx_q->rx_skbuff_dma) - return -ENOMEM; + goto err_dma; rx_q->rx_skbuff = kmalloc_array(DMA_RX_SIZE, sizeof(struct sk_buff *), |