bpf: handle trusted PTR_TO_BTF_ID_OR_NULL in argument check logic
authorAndrii Nakryiko <andrii@kernel.org>
Fri, 2 Feb 2024 19:05:27 +0000 (11:05 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 3 Feb 2024 02:08:58 +0000 (18:08 -0800)
commit8f13c34087d3eb64329529b8517e5a6251653176
treea3fb464c0e39b7aeab5aa2ee9c514bda0e0af6b7
parenta68b50f47bec8bd6a33b07b7e1562db2553981a7
bpf: handle trusted PTR_TO_BTF_ID_OR_NULL in argument check logic

Add PTR_TRUSTED | PTR_MAYBE_NULL modifiers for PTR_TO_BTF_ID to
check_reg_type() to support passing trusted nullable PTR_TO_BTF_ID
registers into global functions accepting `__arg_trusted __arg_nullable`
arguments. This hasn't been caught earlier because tests were either
passing known non-NULL PTR_TO_BTF_ID registers or known NULL (SCALAR)
registers.

When utilizing this functionality in complicated real-world BPF
application that passes around PTR_TO_BTF_ID_OR_NULL, it became apparent
that verifier rejects valid case because check_reg_type() doesn't handle
this case explicitly. Existing check_reg_type() logic is already
anticipating this combination, so we just need to explicitly list this
combo in the switch statement.

Fixes: e2b3c4ff5d18 ("bpf: add __arg_trusted global func arg tag")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20240202190529.2374377-2-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c