From: Eric Dumazet <eric.dumazet@gmail.com>
To: Martin KaFai Lau <kafai@fb.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org
Cc: Alexei Starovoitov <ast@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>,
kernel-team@fb.com, Joe Stringer <joe@isovalent.com>
Subject: Re: [PATCH bpf] bpf: Check sk_fullsock() before returning from bpf_sk_lookup()
Date: Fri, 17 May 2019 14:51:48 -0700 [thread overview]
Message-ID: <6dc01cb7-cdd4-8a71-b602-0052b7aadfb7@gmail.com> (raw)
In-Reply-To: <20190517212117.2792415-1-kafai@fb.com>
On 5/17/19 2:21 PM, Martin KaFai Lau wrote:
> The BPF_FUNC_sk_lookup_xxx helpers return RET_PTR_TO_SOCKET_OR_NULL.
> Meaning a fullsock ptr and its fullsock's fields in bpf_sock can be
> accessed, e.g. type, protocol, mark and priority.
> Some new helper, like bpf_sk_storage_get(), also expects
> ARG_PTR_TO_SOCKET is a fullsock.
>
> bpf_sk_lookup() currently calls sk_to_full_sk() before returning.
> However, the ptr returned from sk_to_full_sk() is not guaranteed
> to be a fullsock. For example, it cannot get a fullsock if sk
> is in TCP_TIME_WAIT.
>
> This patch checks for sk_fullsock() before returning. If it is not
> a fullsock, sock_gen_put() is called if needed and then returns NULL.
>
> Fixes: 6acc9b432e67 ("bpf: Add helper to retrieve socket in BPF")
> Cc: Joe Stringer <joe@isovalent.com>
> Signed-off-by: Martin KaFai Lau <kafai@fb.com>
> ---
> net/core/filter.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 55bfc941d17a..85def5a20aaf 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -5337,8 +5337,14 @@ __bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> struct sock *sk = __bpf_skc_lookup(skb, tuple, len, caller_net,
> ifindex, proto, netns_id, flags);
>
> - if (sk)
> + if (sk) {
> sk = sk_to_full_sk(sk);
> + if (!sk_fullsock(sk)) {
> + if (!sock_flag(sk, SOCK_RCU_FREE))
> + sock_gen_put(sk);
This looks a bit convoluted/weird.
What about telling/asking __bpf_skc_lookup() to not return a non fullsock instead ?
> + return NULL;
> + }
> + }
>
> return sk;
> }
> @@ -5369,8 +5375,14 @@ bpf_sk_lookup(struct sk_buff *skb, struct bpf_sock_tuple *tuple, u32 len,
> struct sock *sk = bpf_skc_lookup(skb, tuple, len, proto, netns_id,
> flags);
>
> - if (sk)
> + if (sk) {
> sk = sk_to_full_sk(sk);
> + if (!sk_fullsock(sk)) {
> + if (!sock_flag(sk, SOCK_RCU_FREE))
> + sock_gen_put(sk);
> + return NULL;
> + }
> + }
>
> return sk;
> }
>
next prev parent reply other threads:[~2019-05-17 21:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 21:21 [PATCH bpf] bpf: Check sk_fullsock() before returning from bpf_sk_lookup() Martin KaFai Lau
2019-05-17 21:51 ` Eric Dumazet [this message]
2019-05-17 22:01 ` Martin Lau
[not found] ` <CADa=RyxisbcVeXL7yq6o02XOgWd87QCzq-6zDXRnm9RoD2WM=A@mail.gmail.com>
2019-05-18 19:05 ` Martin Lau
2019-05-19 1:52 ` Joe Stringer
2019-05-19 2:07 ` Martin Lau
2019-05-20 18:38 ` Martin Lau
2019-05-20 18:56 ` Joe Stringer
2019-05-20 18:57 ` Joe Stringer
2019-05-21 14:48 ` Daniel Borkmann
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=6dc01cb7-cdd4-8a71-b602-0052b7aadfb7@gmail.com \
--to=eric.dumazet@gmail.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=joe@isovalent.com \
--cc=kafai@fb.com \
--cc=kernel-team@fb.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).