diff options
| author | Jian Shen <shenjian15@huawei.com> | 2023-10-30 17:12:56 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-20 11:59:34 +0100 |
| commit | 8c137b1cd60f1124c830b0ef75324fd14d1d6685 (patch) | |
| tree | cd88ddaa0c20e184d95f71a05655abc88c82633f /net | |
| parent | d1835d260d525c2d6576afdea8d78fa03e4eed81 (diff) | |
| download | linux-stable-8c137b1cd60f1124c830b0ef75324fd14d1d6685.tar.gz linux-stable-8c137b1cd60f1124c830b0ef75324fd14d1d6685.tar.bz2 linux-stable-8c137b1cd60f1124c830b0ef75324fd14d1d6685.zip | |
net: page_pool: add missing free_percpu when page_pool_init fail
[ Upstream commit 8ffbd1669ed1d58939d6e878dffaa2f60bf961a4 ]
When ptr_ring_init() returns failure in page_pool_init(), free_percpu()
is not called to free pool->recycle_stats, which may cause memory
leak.
Fixes: ad6fa1e1ab1b ("page_pool: Add recycle stats")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Reviewed-by: Yunsheng Lin <linyunsheng@huawei.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Link: https://lore.kernel.org/r/20231030091256.2915394-1-shaojijie@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/page_pool.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 77cb75e63aca..31f923e7b5c4 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -221,8 +221,12 @@ static int page_pool_init(struct page_pool *pool, return -ENOMEM; #endif - if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) + if (ptr_ring_init(&pool->ring, ring_qsize, GFP_KERNEL) < 0) { +#ifdef CONFIG_PAGE_POOL_STATS + free_percpu(pool->recycle_stats); +#endif return -ENOMEM; + } atomic_set(&pool->pages_state_release_cnt, 0); |