sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpf: net_sched: 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_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>
Link: https://lore.kernel.org/r/20260110082548.113748-8-samitolvanen@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Sami Tolvanen 2026-01-10 08:25:51 +00:00 committed by Alexei Starovoitov
parent b40a5d724f
commit c99d97b466
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/sched/bpf_qdisc.c
View File

@ -202,6 +202,12 @@ __bpf_kfunc void bpf_kfree_skb(struct sk_buff *skb)
kfree_skb(skb); kfree_skb(skb);
} }
__bpf_kfunc void bpf_kfree_skb_dtor(void *skb)
{
bpf_kfree_skb(skb);
}
CFI_NOSEAL(bpf_kfree_skb_dtor);
/* bpf_qdisc_skb_drop - Drop an skb by adding it to a deferred free list. /* bpf_qdisc_skb_drop - Drop an skb by adding it to a deferred free list.
* @skb: The skb whose reference to be released and dropped. * @skb: The skb whose reference to be released and dropped.
* @to_free_list: The list of skbs to be dropped. * @to_free_list: The list of skbs to be dropped.
@ -449,7 +455,7 @@ static struct bpf_struct_ops bpf_Qdisc_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
BTF_ID_LIST_SINGLE(bpf_sk_buff_dtor_ids, func, bpf_kfree_skb) BTF_ID_LIST_SINGLE(bpf_sk_buff_dtor_ids, func, bpf_kfree_skb_dtor)
static int __init bpf_qdisc_kfunc_init(void) static int __init bpf_qdisc_kfunc_init(void)
{ {