summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorBjörn Töpel <bjorn.topel@intel.com>2019-03-13 15:15:49 +0100
committerDaniel Borkmann <daniel@iogearbox.net>2019-03-16 01:27:51 +0100
commit044175a06706d516aa42874bb44dbbfc3c4d20eb (patch)
tree3f937ac758c9a92675819eb56c77dada33e92880 /include/net
parent895383983eee35743e535a08f4fa41c0f9e1382b (diff)
xsk: fix umem memory leak on cleanup
When the umem is cleaned up, the task that created it might already be gone. If the task was gone, the xdp_umem_release function did not free the pages member of struct xdp_umem. It turned out that the task lookup was not needed at all; The code was a left-over when we moved from task accounting to user accounting [1]. This patch fixes the memory leak by removing the task lookup logic completely. [1] https://lore.kernel.org/netdev/20180131135356.19134-3-bjorn.topel@gmail.com/ Link: https://lore.kernel.org/netdev/c1cb2ca8-6a14-3980-8672-f3de0bb38dfd@suse.cz/ Fixes: c0c77d8fb787 ("xsk: add user memory registration support sockopt") Reported-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Björn Töpel <bjorn.topel@intel.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/xdp_sock.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h
index 61cf7dbb6782..d074b6d60f8a 100644
--- a/include/net/xdp_sock.h
+++ b/include/net/xdp_sock.h
@@ -36,7 +36,6 @@ struct xdp_umem {
u32 headroom;
u32 chunk_size_nohr;
struct user_struct *user;
- struct pid *pid;
unsigned long address;
refcount_t users;
struct work_struct work;