[PATCH bpf-next v2 4/7] bpf: verifier: reorder stack size check with dead code sanitization

[Jakub Kicinski]

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: Jakub Kicinski <jakub.kicin...@netronome.com>
Reviewed-by: Jiong Wang <jiong.w...@netronome.com>
---
 kernel/bpf/verifier.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 98ed27bbd045..d27d5a880015 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -6983,10 +6983,11 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr 
*attr,
        free_states(env);
 
        if (ret == 0)
-               sanitize_dead_code(env);
+               ret = check_max_stack_depth(env);
 
+       /* instruction rewrites happen after this point */
        if (ret == 0)
-               ret = check_max_stack_depth(env);
+               sanitize_dead_code(env);
 
        if (ret == 0)
                /* program is valid, convert *(u32*)(ctx + off) accesses */
-- 
2.19.2