diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2017-06-11 00:50:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-11 01:05:45 +0200 |
| commit | d25da6caa2a1d6644360c40d7c5fd7c057551360 (patch) | |
| tree | 4a44563771a6f4cd9704d34d840f8c02c86c22da | |
| parent | bpf: avoid excessive stack usage for perf_sample_data (diff) | |
| download | linux-d25da6caa2a1d6644360c40d7c5fd7c057551360.tar.xz linux-d25da6caa2a1d6644360c40d7c5fd7c057551360.zip | |
bpf: don't check spilled reg state for non-STACK_SPILLed type slots
spilled_regs[] state is only used for stack slots of type STACK_SPILL,
never for STACK_MISC. Right now, in states_equal(), even if we have
old and current stack state of type STACK_MISC, we compare spilled_regs[]
for that particular offset. Just skip these like we do everywhere else.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 14ccb0759fa4..d031b3b0752e 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2828,6 +2828,8 @@ static bool states_equal(struct bpf_verifier_env *env, return false; if (i % BPF_REG_SIZE) continue; + if (old->stack_slot_type[i] != STACK_SPILL) + continue; if (memcmp(&old->spilled_regs[i / BPF_REG_SIZE], &cur->spilled_regs[i / BPF_REG_SIZE], sizeof(old->spilled_regs[0]))) |