net/stmmac: Secure against failures of DMA memory allocation
Subsystems (4)
A message that is not in the archive (sent off-list or not yet received): CGME20260707174134eucas1p2d88b2b6007e833f02ef6497b388374ef@eucas1p2.samsung.com
cover net/stmmac: Secure against failures of DMA memory allocation
This series fixing two possible issues related to fails of __alloc_dma_rx_desc_resources(). Original issue from 1st patch is related to page_pool that has happened in testing env, while second was requested by Sashiko to have similar change for DMA allocation.
To have complete fix for all failures of __alloc_dma_rx_desc_resources(), merge two fixes into series.
---
Note:
1st patch "Set Rx queue page_pool to NULL when freeing DMA resources" is set to v2 while this series is v1. I know this is inconsistent, but this series is not v2 and would be even more confusing.
Hopefully that doesn't break some CI, as second patch is v1.
Link to original:
https://lore.kernel.org/netdev/[email protected]/
Changes in v2 (in first patch):
- Added reviewed by Maxime
- Dropped null check as page_pool_destroy() does provide that
- Modified comment to reflect that
Jakub Raczynski (2):
net/stmmac: Set Rx queue page_pool to NULL when freeing DMA resources net/stmmac: Prevent dma queue NULL free on allocation failure
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 net/stmmac: Set Rx queue page_pool to NULL when freeing DMA resources
When freeing RX descriptor resources, there is standard clearing of descriptor page_pool via page_pool_destroy() which does destroy page but does not set its pointer to NULL, which must be done by driver calling this function.
It is not done in __free_dma_rx_desc_resources() when stopping interface, which is generally not an issue, because __alloc_dma_rx_desc_resources() does setup this regardless of previous state.
But above is true assuming reinitialization is successful.
In case of failure of page_pool_create() in __alloc_dma_rx_desc_resources(), all non-NULL pages will be freed, including those already cleared. So there is possible kernel panic due to wrong paging request at address.
Fix this by assigning NULL to page_pool pointer on free. Also remove NULL check as page_pool_destroy() does check for NULL param.
--- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +2 -2
@@ -2172,8 +2172,8 @@ static void __free_dma_rx_desc_resources(struct stmmac_priv *priv,xdp_rxq_info_unreg (&rx_q->xdp_rxq);kfree (rx_q->buf_pool); -if (rx_q->page_pool) -page_pool_destroy (rx_q->page_pool); +page_pool_destroy (rx_q->page_pool); + rx_q->page_pool =NULL ; } static void free_dma_rx_desc_resources(struct stmmac_priv *priv,
Signature · 1 line
2.34.1
PATCH 2/2 net/stmmac: Prevent dma queue NULL free on allocation failure
In reply to Jakub RaczynskiDuring allocation of RX/TX descriptor resources and its DMA, there is verification of failed dma_alloc_coherent() due to lack of memory. In case of that failure, all allocated resources are freed instantly after, but there are no checks for dma_free_coherent() whether previous step has failed.
This will generally result in panic due to freeing NULL address.
Fix it by adding NULL verification of memory that is to be freed.
Theoretically code should also set address of pointed memory to zero when freeing, but currently the only path of invalid address is non intialized zero, and there is no case possible of double-free of same memory.
--- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +10 -6
@@ -2146,7 +2146,6 @@ static void __free_dma_rx_desc_resources(struct stmmac_priv *priv, u32 queue) {struct stmmac_rx_queue *rx_q = &dma_conf->rx_queue[queue]; -size_t size;void *addr;/* Release the DMA RX socket buffers */
@@ -2164,9 +2163,12 @@ static void __free_dma_rx_desc_resources(struct stmmac_priv *priv,else addr = rx_q->dma_rx; - size =stmmac_get_rx_desc_size (priv) * dma_conf->dma_rx_size; +if (!IS_ERR_OR_NULL (addr)) { +size_t size; + size =stmmac_get_rx_desc_size (priv) * dma_conf->dma_rx_size; -dma_free_coherent (priv->device, size, addr, rx_q->dma_rx_phy); +dma_free_coherent (priv->device, size, addr, rx_q->dma_rx_phy); + }if (xdp_rxq_info_is_reg (&rx_q->xdp_rxq))xdp_rxq_info_unreg (&rx_q->xdp_rxq);
@@ -2198,7 +2200,6 @@ static void __free_dma_tx_desc_resources(struct stmmac_priv *priv, u32 queue) {struct stmmac_tx_queue *tx_q = &dma_conf->tx_queue[queue]; -size_t size;void *addr;/* Release the DMA TX socket buffers */
@@ -2212,9 +2213,12 @@ static void __free_dma_tx_desc_resources(struct stmmac_priv *priv, addr = tx_q->dma_tx; } - size =stmmac_get_tx_desc_size (priv, tx_q) * dma_conf->dma_tx_size; +if (!IS_ERR_OR_NULL (addr)) { +size_t size; + size =stmmac_get_tx_desc_size (priv, tx_q) * dma_conf->dma_tx_size; -dma_free_coherent (priv->device, size, addr, tx_q->dma_tx_phy); +dma_free_coherent (priv->device, size, addr, tx_q->dma_tx_phy); + }kfree (tx_q->tx_skbuff_dma);kfree (tx_q->tx_skbuff);
Signature · 1 line
2.34.1
Re: [PATCH net 2/2] net/stmmac: Prevent dma queue NULL free on allocation failure
Quoted 9 lines · Jakub Raczynski
During allocation of RX/TX descriptor resources and its DMA, there is verification of failed
dma_alloc_coherent()due to lack of memory. In case of that failure, all allocated resources are freed instantly after, but there are no checks fordma_free_coherent()whether previous step has failed.
This will generally result in panic due to freeing NULL address.Fix it by adding NULL verification of memory that is to be freed.
Quoted 8 lines
Theoretically code should also set address of pointed memory to zero when freeing, but currently the only path of invalid address is non intialized zero, and there is no case possible of double-free of same memory.
Fixes e73b19baa3b1c ("net: stmmac: simplify DMA descriptor allocation/init/freeing")Reported-by Sashiko AI <[email protected]>Signed-off-by Jakub Raczynski <[email protected]>---
Sashiko AI gave review that has valid point, patch needs changes. Please drop it.
--
pw-bot: cr