Skip to content

Commit

Permalink
bpf, sockhash: Synchronize_rcu before free'ing map
Browse files Browse the repository at this point in the history
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 2bb90e5 ("bpf:
sockmap, synchronize_rcu before free'ing map") which addressed sockmap,
which comes from a manual audit.

Fixes: 604326b ("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
  • Loading branch information
Jakub Sitnicki authored and Daniel Borkmann committed Feb 7, 2020
1 parent db6a501 commit 0b2dc83
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions net/core/sock_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ static void sock_map_free(struct bpf_map *map)
}
raw_spin_unlock_bh(&stab->lock);

/* wait for psock readers accessing its map link */
synchronize_rcu();

bpf_map_area_free(stab->sks);
Expand Down Expand Up @@ -877,6 +878,9 @@ static void sock_hash_free(struct bpf_map *map)
raw_spin_unlock_bh(&bucket->lock);
}

/* wait for psock readers accessing its map link */
synchronize_rcu();

bpf_map_area_free(htab->buckets);
kfree(htab);
}
Expand Down

0 comments on commit 0b2dc83

Please sign in to comment.