net: mvneta: fix double free of txq->buf
Subsystems (3)
PATCH 1/1 net: mvneta: fix double free of txq->buf
From: Tom Rix <[email protected]>
clang static analysis reports this problem:
drivers/net/ethernet/marvell/mvneta.c:3465:2: warning:
Attempt to free released memory
kfree(txq->buf);
^~~~~~~~~~~~~~~When mvneta_txq_sw_init() fails to alloc txq->tso_hdrs, it frees without poisoning txq->buf. The error is caught in the mvneta_setup_txqs() caller which handles the error by cleaning up all of the txqs with a call to mvneta_txq_sw_deinit which also frees txq->buf.
Since mvneta_txq_sw_deinit is a general cleaner, all of the partial cleaning in mvneta_txq_sw_deinit()'s error handling is not needed.
--- drivers/net/ethernet/marvell/mvneta.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +2 -11
@@ -3397,24 +3397,15 @@ static int mvneta_txq_sw_init(struct mvneta_port *pp, txq->last_desc = txq->size -1 ; txq->buf =kmalloc_array (txq->size,sizeof (*txq->buf),GFP_KERNEL ); -if (!txq->buf) { -dma_free_coherent (pp->dev->dev.parent, - txq->size *MVNETA_DESC_ALIGNED_SIZE , - txq->descs, txq->descs_phys); +if (!txq->buf)return -ENOMEM ; - }/* Allocate DMA buffers for TSO MAC/IP/TCP headers */ txq->tso_hdrs =dma_alloc_coherent (pp->dev->dev.parent, txq->size *TSO_HEADER_SIZE , &txq->tso_hdrs_phys,GFP_KERNEL ); -if (!txq->tso_hdrs) { -kfree (txq->buf); -dma_free_coherent (pp->dev->dev.parent, - txq->size *MVNETA_DESC_ALIGNED_SIZE , - txq->descs, txq->descs_phys); +if (!txq->tso_hdrs)return -ENOMEM ; - }/* Setup XPS mapping */ if (txq_number >1 )
Signature · 1 line
2.18.1
David Miller
maintainerFrom: [email protected]
Date: Sat, 3 Oct 2020 11:51:21 -0700
Quoted 15 lines
From: Tom Rix <[email protected]>
clang static analysis reports this problem:
drivers/net/ethernet/marvell/mvneta.c:3465:2: warning:
Attempt to free released memorykfree(txq->buf); ^~~~~~~~~~~~~~~When
mvneta_txq_sw_init()fails to alloctxq->tso_hdrs, it frees without poisoningtxq->buf. The error is caught in themvneta_setup_txqs()caller which handles the error by cleaning up all of the txqs with a call tomvneta_txq_sw_deinitwhich also freestxq->buf.
Quoted 6 lines
Since
mvneta_txq_sw_deinitis a general cleaner, all of the partial cleaning in mvneta_txq_sw_deinit()'s error handling is not needed.Fixes 2adb719d74f6 ("net: mvneta: Implement software TSO")Signed-off-by Tom Rix <[email protected]>
Applied and queued up for -stable, thank you.