Lorenz Bauer 85b8ac01a4 bpf, sockmap: Check update requirements after locking
It's currently possible to insert sockets in unexpected states into
a sockmap, due to a TOCTTOU when updating the map from a syscall.
sock_map_update_elem checks that sk->sk_state == TCP_ESTABLISHED,
locks the socket and then calls sock_map_update_common. At this
point, the socket may have transitioned into another state, and
the earlier assumptions don't hold anymore. Crucially, it's
conceivable (though very unlikely) that a socket has become unhashed.
This breaks the sockmap's assumption that it will get a callback
via sk->sk_prot->unhash.

Fix this by checking the (fixed) sk_type and sk_protocol without the
lock, followed by a locked check of sk_state.

Unfortunately it's not possible to push the check down into
sock_(map|hash)_update_common, since BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB
run before the socket has transitioned from TCP_SYN_RECV into
TCP_ESTABLISHED.

Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20200207103713.28175-1-lmb@cloudflare.com
2020-02-07 22:28:04 +01:00
..
2019-09-27 15:10:34 -07:00
2019-12-09 10:36:44 -08:00
2019-12-09 10:36:44 -08:00
2020-01-27 11:09:31 +01:00
2020-01-21 12:03:21 +01:00
2019-09-26 08:56:17 +02:00
2020-01-27 11:00:21 +01:00
2020-01-27 11:00:21 +01:00
2019-12-09 10:36:44 -08:00
2019-11-26 14:40:13 -08:00
2020-01-14 18:36:42 -08:00
2020-01-29 11:58:10 +01:00
2020-01-09 18:39:33 -08:00
2020-01-24 13:44:07 +01:00
2020-01-24 13:44:07 +01:00
2020-01-08 15:02:21 -08:00