Use correct destructor kfunc types #10379
Open
+28
−3
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: 688b745 |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
233a075 to
fbe4d04
Compare
Author
|
Upstream branch: bd5bdd2 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
e506329 to
53bcc90
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
fbe4d04 to
6abef8e
Compare
Author
|
Upstream branch: 34235a3 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
53bcc90 to
38986af
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
6abef8e to
2751ec7
Compare
Author
|
Upstream branch: 85bdeeb |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
38986af to
d3e96af
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
2751ec7 to
886a6a6
Compare
Author
|
Upstream branch: ff34657 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
d3e96af to
367b161
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
886a6a6 to
4eeea58
Compare
Author
|
Upstream branch: ff34657 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
367b161 to
fc6f7a7
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
4eeea58 to
a9395d7
Compare
Author
|
Upstream branch: 8f7aa3d |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
fc6f7a7 to
83dce67
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
a9395d7 to
c320ac6
Compare
Author
|
Upstream branch: 835a507 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
83dce67 to
0e8dba9
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
c320ac6 to
d24fc80
Compare
Author
|
Upstream branch: 835a507 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
0e8dba9 to
da28fb1
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
d24fc80 to
155b58a
Compare
Author
|
Upstream branch: 835a507 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
da28fb1 to
10f2657
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
155b58a to
942f7c3
Compare
Author
|
Upstream branch: 81f88f6 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
10f2657 to
9f470a9
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
942f7c3 to
caaaee4
Compare
With CONFIG_CFI enabled, the kernel strictly enforces that indirect
function calls use a function pointer type that matches the target
function. I ran into the following type mismatch when running BPF
self-tests:
CFI failure at bpf_obj_free_fields+0x190/0x238 (target:
bpf_crypto_ctx_release+0x0/0x94; expected type: 0xa488ebfc)
Internal error: Oops - CFI: 00000000f2008228 [#1] SMP
...
As bpf_crypto_ctx_release() is also used in BPF programs and using
a void pointer as the argument would make the verifier unhappy, add
a simple stub function with the correct type and register it as the
destructor kfunc instead.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Tested-by: Viktor Malik <vmalik@redhat.com>
With CONFIG_CFI enabled, the kernel strictly enforces that indirect function calls use a function pointer type that matches the target function. As bpf_kfree_skb() signature differs from the btf_dtor_kfunc_t pointer type used for the destructor calls in bpf_obj_free_fields(), add a stub function with the correct type to fix the type mismatch. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Yonghong Song <yonghong.song@linux.dev>
With CONFIG_CFI enabled, the kernel strictly enforces that indirect function calls use a function pointer type that matches the target function. As bpf_testmod_ctx_release() signature differs from the btf_dtor_kfunc_t pointer type used for the destructor calls in bpf_obj_free_fields(), add a stub function with the correct type to fix the type mismatch. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Yonghong Song <yonghong.song@linux.dev>
Ensure that registered destructor kfuncs have the same type as btf_dtor_kfunc_t to avoid a kernel panic on systems with CONFIG_CFI enabled. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Acked-by: Yonghong Song <yonghong.song@linux.dev>
Author
|
Upstream branch: 5d9fb42 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/1028057=>bpf-next
branch
from
9f470a9 to
33d6bd7
Compare
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: Use correct destructor kfunc types
version: 4
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1028057