Skip to content

Commit 916b82a

Browse files
samitolvanenKernel Patches Daemon
authored andcommitted
bpf: crypto: 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. 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 <[email protected]> Acked-by: Yonghong Song <[email protected]> Tested-by: Viktor Malik <[email protected]>
1 parent 8c83cb5 commit 916b82a

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

kernel/bpf/crypto.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,12 @@ __bpf_kfunc void bpf_crypto_ctx_release(struct bpf_crypto_ctx *ctx)
261261
call_rcu(&ctx->rcu, crypto_free_cb);
262262
}
263263

264+
__bpf_kfunc void bpf_crypto_ctx_release_dtor(void *ctx)
265+
{
266+
bpf_crypto_ctx_release(ctx);
267+
}
268+
CFI_NOSEAL(bpf_crypto_ctx_release_dtor);
269+
264270
static int bpf_crypto_crypt(const struct bpf_crypto_ctx *ctx,
265271
const struct bpf_dynptr_kern *src,
266272
const struct bpf_dynptr_kern *dst,
@@ -368,7 +374,7 @@ static const struct btf_kfunc_id_set crypt_kfunc_set = {
368374

369375
BTF_ID_LIST(bpf_crypto_dtor_ids)
370376
BTF_ID(struct, bpf_crypto_ctx)
371-
BTF_ID(func, bpf_crypto_ctx_release)
377+
BTF_ID(func, bpf_crypto_ctx_release_dtor)
372378

373379
static int __init crypto_kfunc_init(void)
374380
{

0 commit comments

Comments
 (0)