diff options
| author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2017-07-08 09:46:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-11 13:33:53 -0700 |
| commit | 6941f7cc71a719089f7add4afc82bb80fc5a281d (patch) | |
| tree | 92596128cbe6fe7127fd5e4f2872de0d315239eb /drivers/net | |
| parent | 63c3aa6b68782ee5ddb6588d95aacf1ab33e528b (diff) | |
| download | linux-6941f7cc71a719089f7add4afc82bb80fc5a281d.tar.gz linux-6941f7cc71a719089f7add4afc82bb80fc5a281d.tar.bz2 linux-6941f7cc71a719089f7add4afc82bb80fc5a281d.zip | |
net: stmmac: Fix error handling path in 'alloc_dma_tx_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: ce736788e8a9 ("net: stmmac: adding multiple buffers for TX")
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/net')
| -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 4322fa4a13e8..07d486a70118 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1561,7 +1561,7 @@ static int alloc_dma_tx_desc_resources(struct stmmac_priv *priv) sizeof(*tx_q->tx_skbuff_dma), GFP_KERNEL); if (!tx_q->tx_skbuff_dma) - return -ENOMEM; + goto err_dma_buffers; tx_q->tx_skbuff = kmalloc_array(DMA_TX_SIZE, sizeof(struct sk_buff *), |