Commit c99d97b4 authored Jan 10, 2026 by Sami Tolvanen Committed by Alexei Starovoitov Jan 12, 2026

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>

parent b40a5d72

net/sched/bpf_qdisc.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -202,6 +202,12 @@ __bpf_kfunc void bpf_kfree_skb(struct sk_buff *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.
		* @skb: The skb whose reference to be released and 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,
		};

		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)
		{