Commit ba7f1024 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by Alexei Starovoitov
Browse files

selftests/bpf: Use the correct destructor kfunc type 



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: default avatarSami Tolvanen <samitolvanen@google.com>
Acked-by: default avatarYonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20260110082548.113748-9-samitolvanen@google.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c99d97b4

tools/testing/selftests/bpf/test_kmods/bpf_testmod.c

+7 −1
Original line number Diff line number Diff line
@@ -285,6 +285,12 @@ __bpf_kfunc void bpf_testmod_ctx_release(struct bpf_testmod_ctx *ctx) 
		call_rcu(&ctx->rcu, testmod_free_cb);

}



__bpf_kfunc void bpf_testmod_ctx_release_dtor(void *ctx)

{

	bpf_testmod_ctx_release(ctx);

}

CFI_NOSEAL(bpf_testmod_ctx_release_dtor);



static struct bpf_testmod_ops3 *st_ops3;



static int bpf_testmod_test_3(void)
@@ -707,7 +713,7 @@ BTF_KFUNCS_END(bpf_testmod_common_kfunc_ids) 


BTF_ID_LIST(bpf_testmod_dtor_ids)

BTF_ID(struct, bpf_testmod_ctx)

BTF_ID(func, bpf_testmod_ctx_release)

BTF_ID(func, bpf_testmod_ctx_release_dtor)



static const struct btf_kfunc_id_set bpf_testmod_common_kfunc_set = {

	.owner = THIS_MODULE,