bpf: fix do_misc_fixups() for bpf_get_branch_snapshot()
Andrii Nakryiko
maintainerPATCH 1/1 bpf: fix do_misc_fixups() for bpf_get_branch_snapshot()
We need goto next_insn; at the end of patching instead of continue;. It currently works by accident by making verifier re-process patched instructions.
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -21210,7 +21210,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env) delta += cnt -1 ; env->prog = prog = new_prog; insn = new_prog->insnsi + i + delta; -continue ; + goto next_insn; }/* Implement bpf_kptr_xchg inline */
Signature · 1 line
2.43.5
Quoted 7 lines · Andrii Nakryiko
We need
goto next_insn;at the end of patching instead ofcontinue;. It currently works by accident by making verifier re-process patched instructions.Reported-by Shung-Hsi Yu <[email protected]>Fixes 314a53623cd4 ("bpf: inline bpf_get_branch_snapshot() helper")Signed-off-by Andrii Nakryiko <[email protected]>
Quoted 7 lines · Andrii Nakryiko
We need
goto next_insn;at the end of patching instead ofcontinue;. It currently works by accident by making verifier re-process patched instructions.Reported-by Shung-Hsi Yu <[email protected]>Fixes 314a53623cd4 ("bpf: inline bpf_get_branch_snapshot() helper")Signed-off-by Andrii Nakryiko <[email protected]>
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Wed, 23 Oct 2024 09:19:16 -0700 you wrote:
We need
goto next_insn;at the end of patching instead ofcontinue;. It currently works by accident by making verifier re-process patched instructions.Reported-by Shung-Hsi Yu <[email protected]>Fixes 314a53623cd4 ("bpf: inline bpf_get_branch_snapshot() helper")Signed-off-by Andrii Nakryiko <[email protected]>[...]
Here is the summary with links:
- [bpf] bpf: fix do_misc_fixups() for bpf_get_branch_snapshot()
https://git.kernel.org/bpf/bpf/c/9806f283140e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html