bpf/verifier: disallow pointer subtraction
Subsystems (4)
Alexei Starovoitov
maintainerPATCH 1/1 bpf/verifier: disallow pointer subtraction
Subtraction of pointers was accidentally allowed for unpriv programs by commit 82abbf8d2fc4. Revert that part of commit.
Fixes 82abbf8d2fc4 ("bpf: do not allow root to mangle valid pointers")
Reported-by Jann Horn <[email protected]>
Acked-by Daniel Borkmann <[email protected]>
Signed-off-by Alexei Starovoitov <[email protected]>
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -3163,7 +3163,7 @@ static int adjust_reg_min_max_vals(struct bpf_verifier_env *env,* an arbitrary scalar. Disallow all math except * pointer subtraction */ -if (opcode ==BPF_SUB ){ +if (opcode ==BPF_SUB && env->allow_ptr_leaks) {mark_reg_unknown (env, regs, insn->dst_reg);return 0 ; }
Signature · 1 line
2.17.1
Quoted 7 lines · Alexei Starovoitov
Subtraction of pointers was accidentally allowed for unpriv programs by commit
82abbf8d2fc4. Revert that part of commit.Fixes 82abbf8d2fc4 ("bpf: do not allow root to mangle valid pointers")Reported-by Jann Horn <[email protected]>Acked-by Daniel Borkmann <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
Applied to bpf, thanks Alexei!