diff options
| author | Lorenz Bauer <lmb@cloudflare.com> | 2020-09-28 10:08:02 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-09-28 16:40:46 -0700 |
| commit | 6550f2dddfab02a5b948369eeeaedfbc4ae3cc16 (patch) | |
| tree | 30313e28f6393c2d0d7a65ceca78c9f6a1a81dc3 /net/core/sock_map.c | |
| parent | efa90b50934c93647e41da23d87e5d8b670014d4 (diff) | |
| download | linux-6550f2dddfab02a5b948369eeeaedfbc4ae3cc16.tar.bz2 | |
bpf: sockmap: Enable map_update_elem from bpf_iter
Allow passing a pointer to a BTF struct sock_common* when updating
a sockmap or sockhash. Since BTF pointers can fault and therefore be
NULL at runtime we need to add an additional !sk check to
sock_map_update_elem. Since we may be passed a request or timewait
socket we also need to check sk_fullsock. Doing this allows calling
map_update_elem on sockmap from bpf_iter context, which uses
BTF pointers.
Signed-off-by: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200928090805.23343-2-lmb@cloudflare.com
Diffstat (limited to 'net/core/sock_map.c')
| -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 e1f05e3fa1d0..08bc86f51593 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -610,6 +610,9 @@ static int sock_map_update_elem(struct bpf_map *map, void *key, struct sock *sk = (struct sock *)value; int ret; + if (unlikely(!sk || !sk_fullsock(sk))) + return -EINVAL; + if (!sock_map_sk_is_suitable(sk)) return -EOPNOTSUPP; |