net: bpf: Don't leak time wait and request sockets
authorLorenz Bauer <lmb@cloudflare.com>
Fri, 10 Jan 2020 13:23:36 +0000 (13:23 +0000)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 10 Jan 2020 18:42:23 +0000 (10:42 -0800)
commit2e012c74823629d9db27963c79caa3f5b2010746
treef7076cabc30ef3bea7a5ec1485c1e8449594cb2c
parente7a5f1f1cd0008e5ad379270a8657e121eedb669
net: bpf: Don't leak time wait and request sockets

It's possible to leak time wait and request sockets via the following
BPF pseudo code:
 
  sk = bpf_skc_lookup_tcp(...)
  if (sk)
    bpf_sk_release(sk)

If sk->sk_state is TCP_NEW_SYN_RECV or TCP_TIME_WAIT the refcount taken
by bpf_skc_lookup_tcp is not undone by bpf_sk_release. This is because
sk_flags is re-used for other data in both kinds of sockets. The check

  !sock_flag(sk, SOCK_RCU_FREE)

therefore returns a bogus result. Check that sk_flags is valid by calling
sk_fullsock. Skip checking SOCK_RCU_FREE if we already know that sk is
not a full socket.

Fixes: edbf8c01de5a ("bpf: add skc_lookup_tcp helper")
Fixes: f7355a6c0497 ("bpf: Check sk_fullsock() before returning from bpf_sk_lookup()")
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200110132336.26099-1-lmb@cloudflare.com
net/core/filter.c