bpf: avoid jump misprediction for PTR_TO_MEM | PTR_UNTRUSTED
Subsystems (4)
Eduard Zingerman
maintainerPATCH 1/2 bpf: avoid jump misprediction for PTR_TO_MEM | PTR_UNTRUSTED
Commit f2362a57aeff ("bpf: allow void* cast using bpf_rdonly_cast()") added a notion of PTR_TO_MEM | MEM_RDONLY | PTR_UNTRUSTED type. This simultaneously introduced a bug in jump prediction logic for situations like below:
p = bpf_rdonly_cast(..., 0); if (p) a(); else b();
Here verifier would wrongly predict that else branch cannot be taken. This happens because:
- Function reg_not_null() assumes that PTR_TO_MEM w/o PTR_MAYBE_NULL flag cannot be zero.
- The call to bpf_rdonly_cast() returns a rdonly_untrusted_mem value w/o PTR_MAYBE_NULL flag.
Tracking of PTR_MAYBE_NULL flag for untrusted PTR_TO_MEM does not make sense, as the main purpose of the flag is to catch null pointer access errors. Such errors are not possible on load of PTR_UNTRUSTED values and verifier makes sure that PTR_UNTRUSTED can't be passed to helpers or kfuncs.
Hence, modify reg_not_null() to assume that nullness of untrusted PTR_TO_MEM is not known.
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -410,7 +410,7 @@ static bool reg_not_null(const struct bpf_reg_state *reg) type ==PTR_TO_MAP_KEY || type ==PTR_TO_SOCK_COMMON || (type ==PTR_TO_BTF_ID &&is_trusted_reg (reg)) || - type ==PTR_TO_MEM || + (type ==PTR_TO_MEM && !(reg->type &PTR_UNTRUSTED )) || type ==CONST_PTR_TO_MAP ; }
Signature · 1 line
2.49.0
Eduard Zingerman
maintainerPATCH 2/2 selftests/bpf: null checks for rdonly_untrusted_mem should be preserved
Test case checking that verifier does not assume rdonly_untrusted_mem values as not null.
--- .../bpf/progs/mem_rdonly_untrusted.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+)
tools/testing/selftests/bpf/progs/mem_rdonly_untrusted.c +21 -0
@@ -174,4 +174,25 @@ int misaligned_access(void *ctx)return combine (bpf_rdonly_cast (&global,0 ) +1 ); } +__weak int return_one (void ) +{ +return 1 ; +} + +SEC("socket") +__success +__retval(1) +int null_check(void *ctx) +{ +int *p; + + p =bpf_rdonly_cast (0 ,0 ); +if (p ==0 ) +/* make this a function call to avoid compiler +* moving r0 assignment before check. +*/ +return return_one (); +return 0 ; +} + char _license[] SEC("license") = "GPL";
Signature · 1 line
2.49.0
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Wed, 2 Jul 2025 00:36:19 -0700 you wrote:
Commit
f2362a57aeff("bpf: allow void* cast usingbpf_rdonly_cast()") added a notion ofPTR_TO_MEM|MEM_RDONLY|PTR_UNTRUSTEDtype. This simultaneously introduced a bug in jump prediction logic for situations like below:p = bpf_rdonly_cast(..., 0); if (p) a(); else b();[...]
Here is the summary with links:
- [bpf-next,v1,1/2] bpf: avoid jump misprediction for PTR_TO_MEM | PTR_UNTRUSTED
https://git.kernel.org/bpf/bpf-next/c/c8313bad6d24 - [bpf-next,v1,2/2] selftests/bpf: null checks for rdonly_untrusted_mem should be preserved https://git.kernel.org/bpf/bpf-next/c/621af1928153
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html