Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[thirdparty/kernel/linux.git] / kernel / bpf / verifier.c

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 4dd84e13bbfe43c54c6c299051cda9e3132ce862..21f80383f8b215b72df159fcdce0e6073d58c25f 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -16715,6 +16715,9 @@ static bool func_states_equal(struct bpf_verifier_env *env, struct bpf_func_stat
 {
        int i;
 
+       if (old->callback_depth > cur->callback_depth)
+               return false;
+
        for (i = 0; i < MAX_BPF_REG; i++)
                if (!regsafe(env, &old->regs[i], &cur->regs[i],
                             &env->idmap_scratch, exact))