bpf: properly verify tail call behavior #6390
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Upstream branch: 7dc211c |
Author
|
Upstream branch: 7dc211c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1024869=>bpf-next
branch
from
75a9521 to
c5f4f9d
Compare
Author
|
Upstream branch: 7dc211c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1024869=>bpf-next
branch
from
c5f4f9d to
bcd9e76
Compare
Author
|
Upstream branch: 7dc211c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1024869=>bpf-next
branch
from
bcd9e76 to
e71d838
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
c8a7e22 to
c919396
Compare
A successful ebpf tail call does not return to the caller, but to the caller-of-the-caller, often just finishing the ebpf program altogether. Any restrictions that the verifier needs to take into account - notably the fact that the tail call might have modified packet pointers - are to be checked on the caller-of-the-caller. Checking it on the caller made the verifier refuse perfectly fine programs that would use the packet pointers after a tail call, which is no problem as this code is only executed if the tail call was unsuccessful, i.e. nothing happened. This patch simulates the behavior of a tail call in the verifier. A conditional jump to the code after the tail call is added for the case of an unsucessful tail call, and a return to the caller is simulated for a successful tail call. For the successful case we assume that the tail call returns an int, as tail calls are currently only allowed in functions that return and int. We always assume that the tail call modified the packet pointers, as we do not know what the tail call did. For the unsuccessful case we know nothing happened, so we do not need to add new constraints. This approach also allows to check other problems that may occur with tail calls, namely we are now able to check that precision is properly propagated into subprograms using tail calls, as well as checking the live slots in such a subprogram. Fixes: 1a4607f ("bpf: consider that tail calls invalidate packet pointers") Link: https://lore.kernel.org/bpf/[email protected]/ Signed-off-by: Martin Teichmann <[email protected]> Acked-by: Eduard Zingerman <[email protected]>
Three tests are added: - invalidate_pkt_pointers_by_tail_call checks that one can use the packet pointer after a tail call. This was originally possible and also poses not problems, but was made impossible by 1a4607f. - invalidate_pkt_pointers_by_static_tail_call tests a corner case found by Eduard Zingerman during the discussion of the original fix, which was broken in that fix. - subprog_result_tail_call tests that precision propagation works correctly across tail calls. This did not work before. Signed-off-by: Martin Teichmann <[email protected]> Acked-by: Eduard Zingerman <[email protected]>
This updates bpf_insn_successors() reflecting that control flow might jump over the instructions between tail call and function exit, verifier might assume that some writes to parent stack always happen, which is not the case. Acked-by: Eduard Zingerman <[email protected]>
A new test is added: caller_stack_write_tail_call tests that the live stack is correctly tracked for a tail call. Acked-by: Eduard Zingerman <[email protected]>
Author
|
Upstream branch: ec12ab2 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1024869=>bpf-next
branch
from
e71d838 to
1b28125
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf-next_base
branch
from
c919396 to
73c6b0b
Compare
Author
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=1024869 expired. Closing PR. |
kernel-patches-daemon-bpf-rc
bot
deleted the
series/1024869=>bpf-next
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpf: properly verify tail call behavior
version: 5
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1024869