diff options
| author | Yonghong Song <yhs@fb.com> | 2017-11-30 13:47:54 -0800 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2017-12-01 02:56:10 +0100 |
| commit | c8c088ba0edf65044c254b96fc438c91914aaab0 (patch) | |
| tree | 26c2ce03951344a5241e1084cbb68d36275cc61a /kernel/bpf | |
| parent | 2b279419567105d63f1e524bb1ac34ae8f918e5d (diff) | |
| download | linux-c8c088ba0edf65044c254b96fc438c91914aaab0.tar.bz2 | |
bpf: set maximum number of attached progs to 64 for a single perf tp
cgropu+bpf prog array has a maximum number of 64 programs.
Let us apply the same limit here.
Fixes: e87c6bc3852b ("bpf: permit multiple bpf attachments for a single perf event")
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index b9f8686a84cf..86b50aa26ee8 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1447,7 +1447,8 @@ int bpf_prog_array_length(struct bpf_prog_array __rcu *progs) rcu_read_lock(); prog = rcu_dereference(progs)->progs; for (; *prog; prog++) - cnt++; + if (*prog != &dummy_bpf_prog.prog) + cnt++; rcu_read_unlock(); return cnt; } |