git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 4e076ff6ad5302c015617da30d877b4cdcbdf613 Mon Sep 17 00:00:00 2001
   2 From: Lorenzo Bianconi <lorenzo@kernel.org>
   3 Date: Wed, 17 Jul 2024 10:47:19 +0200
   4 Subject: [PATCH] net: airoha: Fix NULL pointer dereference in
   5  airoha_qdma_cleanup_rx_queue()
   6
   7 Move page_pool_get_dma_dir() inside the while loop of
   8 airoha_qdma_cleanup_rx_queue routine in order to avoid possible NULL
   9 pointer dereference if airoha_qdma_init_rx_queue() fails before
  10 properly allocating the page_pool pointer.
  11
  12 Fixes: 23020f049327 ("net: airoha: Introduce ethernet support for EN7581 SoC")
  13 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  14 Reviewed-by: Simon Horman <horms@kernel.org>
  15 Link: https://patch.msgid.link/7330a41bba720c33abc039955f6172457a3a34f0.1721205981.git.lorenzo@kernel.org
  16 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  17 ---
  18  drivers/net/ethernet/mediatek/airoha_eth.c | 3 +--
  19  1 file changed, 1 insertion(+), 2 deletions(-)
  20
  21 --- a/drivers/net/ethernet/mediatek/airoha_eth.c
  22 +++ b/drivers/net/ethernet/mediatek/airoha_eth.c
  23 @@ -1586,7 +1586,6 @@ static int airoha_qdma_init_rx_queue(str
  24
  25  static void airoha_qdma_cleanup_rx_queue(struct airoha_queue *q)
  26  {
  27 -       enum dma_data_direction dir = page_pool_get_dma_dir(q->page_pool);
  28         struct airoha_eth *eth = q->eth;
  29
  30         while (q->queued) {
  31 @@ -1594,7 +1593,7 @@ static void airoha_qdma_cleanup_rx_queue
  32                 struct page *page = virt_to_head_page(e->buf);
  33
  34                 dma_sync_single_for_cpu(eth->dev, e->dma_addr, e->dma_len,
  35 -                                       dir);
  36 +                                       page_pool_get_dma_dir(q->page_pool));
  37                 page_pool_put_full_page(q->page_pool, page, false);
  38                 q->tail = (q->tail + 1) % q->ndesc;
  39                 q->queued--;