diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2021-12-11 17:16:19 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2021-12-11 17:16:19 -0800 |
| commit | 259172bb6514758ce3be1610c500b51a9f44212a (patch) | |
| tree | 0aca5192af1b4508645315c2a3fc74d1f12bfba9 /tools/lib/bpf/gen_loader.c | |
| parent | Merge branch 'add-fdma-support-on-ocelot-switch-driver' (diff) | |
| download | linux-dev-259172bb6514758ce3be1610c500b51a9f44212a.tar.xz linux-dev-259172bb6514758ce3be1610c500b51a9f44212a.zip | |
libbpf: Fix gen_loader assumption on number of programs.
libbpf's obj->nr_programs includes static and global functions. That number
could be higher than the actual number of bpf programs going be loaded by
gen_loader. Passing larger nr_programs to bpf_gen__init() doesn't hurt. Those
exra stack slots will stay as zero. bpf_gen__finish() needs to check that
actual number of progs that gen_loader saw is less than or equal to
obj->nr_programs.
Fixes: ba05fd36b851 ("libbpf: Perform map fd cleanup for gen_loader in case of error")
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | tools/lib/bpf/gen_loader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c index 8ed02e89c9a9..c5859c21d3e9 100644 --- a/tools/lib/bpf/gen_loader.c +++ b/tools/lib/bpf/gen_loader.c @@ -371,8 +371,9 @@ int bpf_gen__finish(struct bpf_gen *gen, int nr_progs, int nr_maps) { int i; - if (nr_progs != gen->nr_progs || nr_maps != gen->nr_maps) { - pr_warn("progs/maps mismatch\n"); + if (nr_progs < gen->nr_progs || nr_maps != gen->nr_maps) { + pr_warn("nr_progs %d/%d nr_maps %d/%d mismatch\n", + nr_progs, gen->nr_progs, nr_maps, gen->nr_maps); gen->error = -EFAULT; return gen->error; } |