diff options
| author | Kui-Feng Lee <thinker.li@gmail.com> | 2024-02-24 14:34:16 -0800 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2024-03-04 10:03:57 -0800 |
| commit | 73e4f9e615d7b99f39663d4722dc73e8fa5db5f9 (patch) | |
| tree | af6063b8367fde8327b948b44be205ca7817c50d /kernel/bpf | |
| parent | 01031fd473059bf69bb6edc6d51d4bd58ad92e50 (diff) | |
| download | linux-73e4f9e615d7b99f39663d4722dc73e8fa5db5f9.tar.gz linux-73e4f9e615d7b99f39663d4722dc73e8fa5db5f9.tar.bz2 linux-73e4f9e615d7b99f39663d4722dc73e8fa5db5f9.zip | |
bpf, net: validate struct_ops when updating value.
Perform all validations when updating values of struct_ops maps. Doing
validation in st_ops->reg() and st_ops->update() is not necessary anymore.
However, tcp_register_congestion_control() has been called in various
places. It still needs to do validations.
Cc: netdev@vger.kernel.org
Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
Link: https://lore.kernel.org/r/20240224223418.526631-2-thinker.li@gmail.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/bpf_struct_ops.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c index a6019087b467..07e554c191d1 100644 --- a/kernel/bpf/bpf_struct_ops.c +++ b/kernel/bpf/bpf_struct_ops.c @@ -672,13 +672,14 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key, *(unsigned long *)(udata + moff) = prog->aux->id; } + if (st_ops->validate) { + err = st_ops->validate(kdata); + if (err) + goto reset_unlock; + } + if (st_map->map.map_flags & BPF_F_LINK) { err = 0; - if (st_ops->validate) { - err = st_ops->validate(kdata); - if (err) - goto reset_unlock; - } arch_protect_bpf_trampoline(st_map->image, PAGE_SIZE); /* Let bpf_link handle registration & unregistration. * |