diff options
| author | Jakub Sitnicki <jakub@cloudflare.com> | 2020-02-06 12:16:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-24 08:36:32 +0100 |
| commit | ad9728b377a679d2ad9b71c7fdbb28f6c7258292 (patch) | |
| tree | 18ba6bf7d7bd1f1b2b2d63b5863c3dcc6a052080 | |
| parent | 25c85d8574d8e4466a6334325a5ab5a3aab3c4c2 (diff) | |
| download | linux-stable-ad9728b377a679d2ad9b71c7fdbb28f6c7258292.tar.gz linux-stable-ad9728b377a679d2ad9b71c7fdbb28f6c7258292.tar.bz2 linux-stable-ad9728b377a679d2ad9b71c7fdbb28f6c7258292.zip | |
bpf, sockhash: Synchronize_rcu before free'ing map
[ Upstream commit 0b2dc83906cf1e694e48003eae5df8fa63f76fd9 ]
We need to have a synchronize_rcu before free'ing the sockhash because any
outstanding psock references will have a pointer to the map and when they
use it, this could trigger a use after free.
This is a sister fix for sockhash, following commit 2bb90e5cc90e ("bpf:
sockmap, synchronize_rcu before free'ing map") which addressed sockmap,
which comes from a manual audit.
Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20200206111652.694507-3-jakub@cloudflare.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | net/core/sock_map.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 085cef5857bb..405397801bb0 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -881,6 +881,9 @@ static void sock_hash_free(struct bpf_map *map) /* wait for psock readers accessing its map link */ synchronize_rcu(); + /* wait for psock readers accessing its map link */ + synchronize_rcu(); + bpf_map_area_free(htab->buckets); kfree(htab); } |