bpf: Resolve fext program type when checking map compatibility #4181
Conversation
This file contains 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
|
Upstream branch: e931a17 |
kernel-patches-bot
force-pushed
the
bpf_base
branch
from
7d8e059
to
6c22984
Compare
|
Upstream branch: 87a3988 |
kernel-patches-bot
force-pushed
the
series/702768=>bpf
branch
from
3ab1121
to
6a284ba
Compare
The bpf_prog_map_compatible() check makes sure that BPF program types are not mixed inside BPF map types that can contain programs (tail call maps, cpumaps and devmaps). It does this by setting the fields of the map->owner struct to the values of the first program being checked against, and rejecting any subsequent programs if the values don't match. One of the values being set in the map owner struct is the program type, and since the code did not resolve the prog type for fext programs, the map owner type would be set to PROG_TYPE_EXT and subsequent loading of programs of the target type into the map would fail. This bug is seen in particular for XDP programs that are loaded as PROG_TYPE_EXT using libxdp; these cannot insert programs into devmaps and cpumaps because the check fails as described above. Fix the bug by resolving the fext program type to its target program type as elsewhere in the verifier. This requires constifying the parameter of resolve_prog_type() to avoid a compiler warning from the new call site. Fixes: f45d5b6 ("bpf: generalise tail call map compatibility check") Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
…program This adds a simple test for inserting an XDP program into a cpumap that is "owned" by an XDP program that was loaded as PROG_TYPE_EXT (as libxdp does). Prior to the kernel fix this would fail because the map type ownership would be set to PROG_TYPE_EXT instead of being resolved to PROG_TYPE_XDP. Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
|
Upstream branch: 87a3988 |
kernel-patches-bot
force-pushed
the
series/702768=>bpf
branch
from
6a284ba
to
292e9ef
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=703306 expired. Closing PR. |
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: Resolve fext program type when checking map compatibility
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=702768