bpf: Sockmap, ensure sock lock held during tear down

BugLink: https://bugs.launchpad.net/bugs/1862429
commit 7e81a35302066c5a00b4c72d83e3ea4cad6eeb5b upstream.

The sock_map_free() and sock_hash_free() paths used to delete sockmap
and sockhash maps walk the maps and destroy psock and bpf state associated
with the socks in the map. When done the socks no longer have BPF programs
attached and will function normally. This can happen while the socks in
the map are still "live" meaning data may be sent/received during the walk.

Currently, though we don't take the sock_lock when the psock and bpf state
is removed through this path. Specifically, this means we can be writing
into the ops structure pointers such as sendmsg, sendpage, recvmsg, etc.
while they are also being called from the networking side. This is not
safe, we never used proper READ_ONCE/WRITE_ONCE semantics here if we
believed it was safe. Further its not clear to me its even a good idea
to try and do this on "live" sockets while networking side might also
be using the socket. Instead of trying to reason about using the socks
from both sides lets realize that every use case I'm aware of rarely
deletes maps, in fact kubernetes/Cilium case builds map at init and
never tears it down except on errors. So lets do the simple fix and
grab sock lock.

This patch wraps sock deletes from maps in sock lock and adds some
annotations so we catch any other cases easier.

Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Song Liu <songliubraving@fb.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/bpf/20200111061206.8028-3-john.fastabend@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 9b340f0191acc674712232f842bb4cfc7bfe8236..c750b173260936a46d45956890683c8ad6f5e759 100644 (file)
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -595,6 +595,8 @@ EXPORT_SYMBOL_GPL(sk_psock_destroy);
 
 void sk_psock_drop(struct sock *sk, struct sk_psock *psock)
 {
+       sock_owned_by_me(sk);
+
        sk_psock_cork_free(psock);
        sk_psock_zap_ingress(psock);
 

diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index 50916f9bc4f2e5b7814943e7528f46d5df44b502..4fd86a584da51953a73b5612827f5f0945348cab 100644 (file)
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -241,8 +241,11 @@ static void sock_map_free(struct bpf_map *map)
                struct sock *sk;
 
                sk = xchg(psk, NULL);
-               if (sk)
+               if (sk) {
+                       lock_sock(sk);
                        sock_map_unref(sk, psk);
+                       release_sock(sk);
+               }
        }
        raw_spin_unlock_bh(&stab->lock);
        rcu_read_unlock();
@@ -862,7 +865,9 @@ static void sock_hash_free(struct bpf_map *map)
                raw_spin_lock_bh(&bucket->lock);
                hlist_for_each_entry_safe(elem, node, &bucket->head, node) {
                        hlist_del_rcu(&elem->node);
+                       lock_sock(elem->sk);
                        sock_map_unref(elem->sk, elem);
+                       release_sock(elem->sk);
                }
                raw_spin_unlock_bh(&bucket->lock);
        }