diff options
| author | Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> | 2019-08-15 23:56:35 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 07:18:31 +0200 |
| commit | f4a9b28782c609b184a746c3549f0c161198c0b5 (patch) | |
| tree | 7853d722a130174001fc7be227179a3259537e83 /net | |
| parent | b484e28554d0a69488144fda2a1bba5add8cf2a7 (diff) | |
| download | linux-stable-f4a9b28782c609b184a746c3549f0c161198c0b5.tar.gz linux-stable-f4a9b28782c609b184a746c3549f0c161198c0b5.tar.bz2 linux-stable-f4a9b28782c609b184a746c3549f0c161198c0b5.zip | |
xdp: unpin xdp umem pages in error path
[ Upstream commit fb89c39455e4b49881c5a42761bd71f03d3ef888 ]
Fix mem leak caused by missed unpin routine for umem pages.
Fixes: 8aef7340ae9695 ("xsk: introduce xdp_umem_page")
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/xdp/xdp_umem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 9c6de4f114f8..9bd7b96027c1 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -368,7 +368,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) umem->pages = kcalloc(umem->npgs, sizeof(*umem->pages), GFP_KERNEL); if (!umem->pages) { err = -ENOMEM; - goto out_account; + goto out_pin; } for (i = 0; i < umem->npgs; i++) @@ -376,6 +376,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) return 0; +out_pin: + xdp_umem_unpin_pages(umem); out_account: xdp_umem_unaccount_pages(umem); return err; |