diff options
| author | Alexei Starovoitov <ast@fb.com> | 2017-05-30 13:31:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-31 19:29:47 -0400 |
| commit | 80a58d02559465b0ea403ff91c8bca9a733b1b0d (patch) | |
| tree | af3635d78e8274242fd6bf59a076f7a760cea7a7 /kernel | |
| parent | 8726679a0fa317f8e83d0843b266453f31bff092 (diff) | |
| download | linux-stable-80a58d02559465b0ea403ff91c8bca9a733b1b0d.tar.gz linux-stable-80a58d02559465b0ea403ff91c8bca9a733b1b0d.tar.bz2 linux-stable-80a58d02559465b0ea403ff91c8bca9a733b1b0d.zip | |
bpf: reconcile bpf_tail_call and stack_depth
The next set of patches will take advantage of stack_depth tracking,
so make sure that the program that does bpf_tail_call() has
stack depth large enough for the callee.
We could have tracked the stack depth of the prog_array owner program
and only allow insertion of the programs with stack depth less
than the owner, but it will break existing applications.
Some of them have trivial root bpf program that only does
multiple bpf_tail_calls and at init time the prog array is empty.
In the future we may add a flag to do such tracking optionally,
but for now play simple and safe.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/verifier.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index d96f27ff9f6f..14ccb0759fa4 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -3470,6 +3470,7 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env) * the program array. */ prog->cb_access = 1; + env->prog->aux->stack_depth = MAX_BPF_STACK; /* mark bpf_tail_call as different opcode to avoid * conditional branch in the interpeter for every normal |