Skip to content

Commit 063571a

Browse files
author
Paolo Abeni
committed
Merge branch 'net-airoha-fix-null-pointer-derefrences-in-airoha_qdma_cleanup'
Lorenzo Bianconi says: ==================== net: airoha: Fix NULL pointer derefrences in airoha_qdma_cleanup() Fix two possible NULL pointer derefrences in airoha_qdma_cleanup routine if airoha_qdma_init() fails. v1: https://lore.kernel.org/r/20260417-airoha_qdma_init_rx_queue-fix-v1-0-db9fa5e468e5@kernel.org ==================== Link: https://patch.msgid.link/20260420-airoha_qdma_init_rx_queue-fix-v2-0-d99347e5c18d@kernel.org Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2 parents 7dddc74 + 4b91cb6 commit 063571a

1 file changed

Lines changed: 15 additions & 10 deletions

File tree

drivers/net/ethernet/airoha/airoha_eth.c

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -745,14 +745,18 @@ static int airoha_qdma_init_rx_queue(struct airoha_queue *q,
745745
dma_addr_t dma_addr;
746746

747747
q->buf_size = PAGE_SIZE / 2;
748-
q->ndesc = ndesc;
749748
q->qdma = qdma;
750749

751-
q->entry = devm_kzalloc(eth->dev, q->ndesc * sizeof(*q->entry),
750+
q->entry = devm_kzalloc(eth->dev, ndesc * sizeof(*q->entry),
752751
GFP_KERNEL);
753752
if (!q->entry)
754753
return -ENOMEM;
755754

755+
q->desc = dmam_alloc_coherent(eth->dev, ndesc * sizeof(*q->desc),
756+
&dma_addr, GFP_KERNEL);
757+
if (!q->desc)
758+
return -ENOMEM;
759+
756760
q->page_pool = page_pool_create(&pp_params);
757761
if (IS_ERR(q->page_pool)) {
758762
int err = PTR_ERR(q->page_pool);
@@ -761,11 +765,7 @@ static int airoha_qdma_init_rx_queue(struct airoha_queue *q,
761765
return err;
762766
}
763767

764-
q->desc = dmam_alloc_coherent(eth->dev, q->ndesc * sizeof(*q->desc),
765-
&dma_addr, GFP_KERNEL);
766-
if (!q->desc)
767-
return -ENOMEM;
768-
768+
q->ndesc = ndesc;
769769
netif_napi_add(eth->napi_dev, &q->napi, airoha_qdma_rx_napi_poll);
770770

771771
airoha_qdma_wr(qdma, REG_RX_RING_BASE(qid), dma_addr);
@@ -1020,8 +1020,6 @@ static int airoha_qdma_tx_irq_init(struct airoha_tx_irq_queue *irq_q,
10201020
struct airoha_eth *eth = qdma->eth;
10211021
dma_addr_t dma_addr;
10221022

1023-
netif_napi_add_tx(eth->napi_dev, &irq_q->napi,
1024-
airoha_qdma_tx_napi_poll);
10251023
irq_q->q = dmam_alloc_coherent(eth->dev, size * sizeof(u32),
10261024
&dma_addr, GFP_KERNEL);
10271025
if (!irq_q->q)
@@ -1031,6 +1029,9 @@ static int airoha_qdma_tx_irq_init(struct airoha_tx_irq_queue *irq_q,
10311029
irq_q->size = size;
10321030
irq_q->qdma = qdma;
10331031

1032+
netif_napi_add_tx(eth->napi_dev, &irq_q->napi,
1033+
airoha_qdma_tx_napi_poll);
1034+
10341035
airoha_qdma_wr(qdma, REG_TX_IRQ_BASE(id), dma_addr);
10351036
airoha_qdma_rmw(qdma, REG_TX_IRQ_CFG(id), TX_IRQ_DEPTH_MASK,
10361037
FIELD_PREP(TX_IRQ_DEPTH_MASK, size));
@@ -1450,8 +1451,12 @@ static void airoha_qdma_cleanup(struct airoha_qdma *qdma)
14501451
}
14511452
}
14521453

1453-
for (i = 0; i < ARRAY_SIZE(qdma->q_tx_irq); i++)
1454+
for (i = 0; i < ARRAY_SIZE(qdma->q_tx_irq); i++) {
1455+
if (!qdma->q_tx_irq[i].size)
1456+
continue;
1457+
14541458
netif_napi_del(&qdma->q_tx_irq[i].napi);
1459+
}
14551460

14561461
for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++) {
14571462
if (!qdma->q_tx[i].ndesc)

0 commit comments

Comments
 (0)