浏览代码

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>
Ivan Khoronzhuk 6 年之前
父节点
当前提交
30881d79de
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      net/xdp/xdp_umem.c

+ 3 - 1
net/xdp/xdp_umem.c

@@ -322,7 +322,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);
 	umem->pages = kcalloc(umem->npgs, sizeof(*umem->pages), GFP_KERNEL);
 	if (!umem->pages) {
 	if (!umem->pages) {
 		err = -ENOMEM;
 		err = -ENOMEM;
-		goto out_account;
+		goto out_pin;
 	}
 	}
 
 
 	for (i = 0; i < umem->npgs; i++)
 	for (i = 0; i < umem->npgs; i++)
@@ -330,6 +330,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
 
 
 	return 0;
 	return 0;
 
 
+out_pin:
+	xdp_umem_unpin_pages(umem);
 out_account:
 out_account:
 	xdp_umem_unaccount_pages(umem);
 	xdp_umem_unaccount_pages(umem);
 	return err;
 	return err;