Commit 9b38c405 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann

bpf: verifier: reorder stack size check with dead code sanitization

Reorder the calls to check_max_stack_depth() and sanitize_dead_code()
to separate functions which can rewrite instructions from pure checks.

No functional changes.
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarJiong Wang <jiong.wang@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 14507e35
...@@ -6983,10 +6983,11 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, ...@@ -6983,10 +6983,11 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr,
free_states(env); free_states(env);
if (ret == 0) if (ret == 0)
sanitize_dead_code(env); ret = check_max_stack_depth(env);
/* instruction rewrites happen after this point */
if (ret == 0) if (ret == 0)
ret = check_max_stack_depth(env); sanitize_dead_code(env);
if (ret == 0) if (ret == 0)
/* program is valid, convert *(u32*)(ctx + off) accesses */ /* program is valid, convert *(u32*)(ctx + off) accesses */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment