diff options
| author | Mina Almasry <almasrymina@google.com> | 2025-08-21 03:03:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-09-04 16:55:36 +0200 |
| commit | 69d75cb29e29a7cebf7ce3589667974b7478d5ee (patch) | |
| tree | 0017a3b6c727da53faf54f317707be4fd7636fd9 | |
| parent | 42f0533d5aa74ae1267631e825c3efb10acca273 (diff) | |
page_pool: fix incorrect mp_ops error handling
[ Upstream commit abadf0ff63be488dc502ecfc9f622929a21b7117 ]
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>
Signed-off-by: Sasha Levin <sashal@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 368412baad26..e14d743554ec 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; |