diff options
| author |   Mina Almasry <almasrymina@google.com> | 2025-08-21 03:03:46 +0000 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2025-08-22 15:52:02 -0700 |
| commit | abadf0ff63be488dc502ecfc9f622929a21b7117 (patch) | |
| tree | 98c3de2a6c94f969f940f709997693f489481ddb | |
| parent | net: macb: fix unregister_netdev call order in macb_remove() (diff) | |
| download | wireguard-linux-abadf0ff63be488dc502ecfc9f622929a21b7117.tar.xz wireguard-linux-abadf0ff63be488dc502ecfc9f622929a21b7117.zip | |
page_pool: fix incorrect mp_ops error handling
Minor fix to the memory provider error handling, we should be jumping to
free_ptr_ring in this error case rather than returning directly.
Found by code-inspection.
Cc: skhawaja@google.com
Fixes: b400f4b87430 ("page_pool: Set `dma_sync` to false for devmem memory provider")
Signed-off-by: Mina Almasry <almasrymina@google.com>
Reviewed-by: Samiullah Khawaja <skhawaja@google.com>
Link: https://patch.msgid.link/20250821030349.705244-1-almasrymina@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | net/core/page_pool.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 343a6cac21e3..ba70569bd4b0 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -287,8 +287,10 @@ static int page_pool_init(struct page_pool *pool, } if (pool->mp_ops) { - if (!pool->dma_map || !pool->dma_sync) - return -EOPNOTSUPP; + if (!pool->dma_map || !pool->dma_sync) { + err = -EOPNOTSUPP; + goto free_ptr_ring; + } if (WARN_ON(!is_kernel_rodata((unsigned long)pool->mp_ops))) { err = -EFAULT; |