diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-01-14 15:20:46 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-01-14 15:22:01 -0800 |
| commit | e3d0dbb3b5e8983d3be780199af1e5134c8a9c17 (patch) | |
| tree | 2792d41d5fe461217460b69d829b5392380272d2 /kernel/bpf/verifier.c | |
| parent | 46c76760febfb14618d88f6a01fca2d93d003082 (diff) | |
| parent | c537e12daeecaecdcd322c56a5f70659d2de7bde (diff) | |
| download | linux-next-e3d0dbb3b5e8983d3be780199af1e5134c8a9c17.tar.gz linux-next-e3d0dbb3b5e8983d3be780199af1e5134c8a9c17.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc5
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Adjacent:
Auto-merging MAINTAINERS
Auto-merging Makefile
Auto-merging kernel/bpf/verifier.c
Auto-merging kernel/sched/ext.c
Auto-merging mm/memcontrol.c
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/verifier.c')
| -rw-r--r-- | kernel/bpf/verifier.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index faa1ecc1fe9d..62ad7c79ce2d 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -9606,6 +9606,11 @@ static int check_reg_const_str(struct bpf_verifier_env *env, if (reg->type != PTR_TO_MAP_VALUE) return -EINVAL; + if (map->map_type == BPF_MAP_TYPE_INSN_ARRAY) { + verbose(env, "R%d points to insn_array map which cannot be used as const string\n", regno); + return -EACCES; + } + if (!bpf_map_is_rdonly(map)) { verbose(env, "R%d does not point to a readonly map'\n", regno); return -EACCES; |