From: John Fastabend <john.fastabend@gmail.com>
To: Jakub Sitnicki <jakub@cloudflare.com>, bpf@vger.kernel.org
Cc: netdev@vger.kernel.org, kernel-team@cloudflare.com
Subject: RE: [PATCH bpf 1/2] bpf, sockhash: Fix memory leak when unlinking sockets in sock_hash_free
Date: Tue, 09 Jun 2020 09:56:56 -0700 [thread overview]
Message-ID: <5edfbf58f0ff1_5cca2af6a27f45b8fc@john-XPS-13-9370.notmuch> (raw)
In-Reply-To: <20200607205229.2389672-2-jakub@cloudflare.com>
Jakub Sitnicki wrote:
> When sockhash gets destroyed while sockets are still linked to it, we will
> walk the bucket lists and delete the links. However, we are not freeing the
> list elements after processing them, leaking the memory.
>
> The leak can be triggered by close()'ing a sockhash map when it still
> contains sockets, and observed with kmemleak:
>
> unreferenced object 0xffff888116e86f00 (size 64):
> comm "race_sock_unlin", pid 223, jiffies 4294731063 (age 217.404s)
> hex dump (first 32 bytes):
> 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
> 81 de e8 41 00 00 00 00 c0 69 2f 15 81 88 ff ff ...A.....i/.....
> backtrace:
> [<00000000dd089ebb>] sock_hash_update_common+0x4ca/0x760
> [<00000000b8219bd5>] sock_hash_update_elem+0x1d2/0x200
> [<000000005e2c23de>] __do_sys_bpf+0x2046/0x2990
> [<00000000d0084618>] do_syscall_64+0xad/0x9a0
> [<000000000d96f263>] entry_SYSCALL_64_after_hwframe+0x49/0xb3
>
> Fix it by freeing the list element when we're done with it.
>
> Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
> Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
> ---
> net/core/sock_map.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/core/sock_map.c b/net/core/sock_map.c
> index 00a26cf2cfe9..ea46f07a22d8 100644
> --- a/net/core/sock_map.c
> +++ b/net/core/sock_map.c
> @@ -1031,6 +1031,7 @@ static void sock_hash_free(struct bpf_map *map)
> sock_map_unref(elem->sk, elem);
> rcu_read_unlock();
> release_sock(elem->sk);
> + sock_hash_free_elem(htab, elem);
> }
> }
>
> --
> 2.25.4
>
In Cilium we pin the map and never release it thanks for catching this.
Acked-by: John Fastabend <john.fastabend@gmail.com>
next prev parent reply other threads:[~2020-06-09 16:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-07 20:52 [PATCH bpf 0/2] Fixes for sock_hash_free Jakub Sitnicki
2020-06-07 20:52 ` [PATCH bpf 1/2] bpf, sockhash: Fix memory leak when unlinking sockets in sock_hash_free Jakub Sitnicki
2020-06-09 16:56 ` John Fastabend [this message]
2020-06-07 20:52 ` [PATCH bpf 2/2] bpf, sockhash: Synchronize delete from bucket list on map free Jakub Sitnicki
2020-06-09 17:09 ` John Fastabend
2020-06-09 18:04 ` Alexei Starovoitov
2020-06-09 20:29 ` John Fastabend
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5edfbf58f0ff1_5cca2af6a27f45b8fc@john-XPS-13-9370.notmuch \
--to=john.fastabend@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=jakub@cloudflare.com \
--cc=kernel-team@cloudflare.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).