From nobody Sat Feb 7 08:44:09 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A9C4026CE1E for ; Sat, 10 Jan 2026 08:25:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033558; cv=none; b=UaC70d4b/gX0VOCWTa4RsOUmeRlXRg8dyC0vuXaEwMCcvzztK3dhvmiN3QekfgthJyrDls+/Z8XB3qPwydw/aYneyx+ttns0XlZL03nkXRm4qeHTR8IheU6idMN9VQjCjrWs2MbLRemLVf8nX9CX23bCogtRYluTvIDq9pFTT+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033558; c=relaxed/simple; bh=YneUrfDC+afPg04mHEBCFzOnJ9GClFp9DvMMnQVWiXc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=C5WDkZ8W6UazeD7KYJ7LOt8w94pKupb54QKd/Zgujgwzwg9PJZ2V+6EdSL7ACv8GCdOa4LYWKne11OPiCEob6tls7Q4FCYBBOR4+gr65j87gAnULPNMvxnJM6evspOLmmIkfnP1kgTQoXNHn2mhqkZPHLueQkO9RSNqUkAZ5FMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hRaWMV27; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hRaWMV27" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-81ed3e6b917so775927b3a.1 for ; Sat, 10 Jan 2026 00:25:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768033557; x=1768638357; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=tJF1LUIh8jkifINEtEw71yvGIoLQhEraR0Au5jgHYts=; b=hRaWMV2737wsK6ATqj/KN/3SVDkFsq9EQDlrpouiLQaLexxb+bIP6YiOsNOOkUzX+3 bRViMSOJzg8L+ZPh8F18AGfLOO+EOHBIRzdwELF1s4ii7dkrYKE7CrxN1aKS5v+/MDXD vb9Y7twLp8DGVjE0DgcxxlvX8NNq2TRN6aahFiJMazYdyv53brw9sZLetMmhTaWIK+nk CMLop5NlFeK1+73fAKd+Ai4e3V3JQH/JWWGKPwNTWl0KHFYB5X+Y3w3fwnaDX0vgto9X ZqRqNVZHNDjbpgClzzecux7tJtqIAbU1BQC1yuYaDQ8/KBjMltbR2Bp4tjaJnEYMLszA 5G0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768033557; x=1768638357; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tJF1LUIh8jkifINEtEw71yvGIoLQhEraR0Au5jgHYts=; b=DYNt9Jz4U7KhSUv4dFcAT43nOja7MQX2LAQCro3h8xPH8PsAizBdhChJ6gzqr3iv9i aWy1U2MsUCgGVJ299b2huxwkCjkR383JzvDBqM2mei2CovW6XVZHEBnAlgf64sTT5XtA QzN1diRReyvroHBNRGsLB92OoE9IPc1oPffaBY9/oGnQ8hk2HFBzRZDqqxhGWmNk3pcI x6UKV6coMDGj9BQdeVZAFsRf2afXcoLO0HlYGhV7Ts+U0zjFHL7N4Dcjv/5V4Mfxabp6 eGeu0CJo5h25VYj3iHLcQ4WdbhODdA/RmuxuxNPx747+u4368gVg94kzZnJwjKyosTKA KXMg== X-Forwarded-Encrypted: i=1; AJvYcCXKKH/ClLw5SXrUlH6QcP2/x5cQrpP8kYEQ32rU3byVrIDE7gjGfkpRyWKx2B+kca+sWmx3Eyr6HQmIqwA=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8EMPPIoAYMBgV94yGog5u4NrBBelhxLO4URopIehWJbXkV5PK FOWldJcBXqlEHCx8jkgFpkGQ1XnHphVlvrKjdz0pbOguFk3tdT36e9HB/YXII8KxUGf1kbrDuyr Xa7m6qN0h2TtYAj4ee6dPIayr5aBWfg== X-Google-Smtp-Source: AGHT+IF8OevB1WR6kexFfrfNZzGzpamdEcA6jEwIpPLjN+f4AucUzGZNCkumFIP44/6yhkDe+QYhRZxaIwfK9sDGBpk= X-Received: from pfvo27.prod.google.com ([2002:a05:6a00:1b5b:b0:7b8:909:1a04]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2907:b0:81f:3cd5:2072 with SMTP id d2e1a72fcca58-81f3cd5233emr1056219b3a.3.1768033556888; Sat, 10 Jan 2026 00:25:56 -0800 (PST) Date: Sat, 10 Jan 2026 08:25:50 +0000 In-Reply-To: <20260110082548.113748-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260110082548.113748-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1790; i=samitolvanen@google.com; h=from:subject; bh=YneUrfDC+afPg04mHEBCFzOnJ9GClFp9DvMMnQVWiXc=; b=owGbwMvMwCUWxa662nLh8irG02pJDJlJvLxcT5nqueWZli1lnqP8qvqkPW8O90oztzv6ale/m xk31+Z1lLIwiHExyIopsrR8Xb1193en1FefiyRg5rAygQxh4OIUgIlMzWZkeHWf9aXJ5j8yMfyL zIxP7877dvgzR/Z1exZb1QlPfz67bMzIcOVS9d+496GTn2hk3FIqet64jWnOj7eT3+i8+XS1wXj NJTYA X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260110082548.113748-7-samitolvanen@google.com> Subject: [PATCH bpf-next v5 1/4] bpf: crypto: Use the correct destructor kfunc type From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Viktor Malik , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Yonghong Song Tested-by: Viktor Malik Acked-by: Martin KaFai Lau --- kernel/bpf/crypto.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/crypto.c b/kernel/bpf/crypto.c index 1ab79a6dec84..7e75a1936256 100644 --- a/kernel/bpf/crypto.c +++ b/kernel/bpf/crypto.c @@ -261,6 +261,12 @@ __bpf_kfunc void bpf_crypto_ctx_release(struct bpf_cry= pto_ctx *ctx) call_rcu(&ctx->rcu, crypto_free_cb); } =20 +__bpf_kfunc void bpf_crypto_ctx_release_dtor(void *ctx) +{ + bpf_crypto_ctx_release(ctx); +} +CFI_NOSEAL(bpf_crypto_ctx_release_dtor); + static int bpf_crypto_crypt(const struct bpf_crypto_ctx *ctx, const struct bpf_dynptr_kern *src, const struct bpf_dynptr_kern *dst, @@ -368,7 +374,7 @@ static const struct btf_kfunc_id_set crypt_kfunc_set = =3D { =20 BTF_ID_LIST(bpf_crypto_dtor_ids) BTF_ID(struct, bpf_crypto_ctx) -BTF_ID(func, bpf_crypto_ctx_release) +BTF_ID(func, bpf_crypto_ctx_release_dtor) =20 static int __init crypto_kfunc_init(void) { --=20 2.52.0.457.g6b5491de43-goog From nobody Sat Feb 7 08:44:09 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7560D2E9EAA for ; Sat, 10 Jan 2026 08:25:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033564; cv=none; b=jDmX9tG1YJNS/7GI0XMolIA5UtIOaDNW2EHiv8gh7Qb4QsD/+X5mtnA1/3ecoCl27BTGH/J3PBIkvbUwEoVgh5ztnw6ZkXHY+FOlHuLYyusc5R2fjdE6idklO9Oxhwme8NCDm2K5ok7yVf7/InCU8zx66fJfuqES1iiJc2rDH/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033564; c=relaxed/simple; bh=RBrjhm4+4Jiaj85vSZsjK0QkF6TyPfp4BVqBMhLxtnU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aDo8UbVbL04tdo+0HeZuPDFevlzWY6On7lMYTqpJnP1NSF8lqu7Y+4F75cdakqCoXDpImwwzwsCs8zWag8vbO2t66ObAxbe3pDFD1Ex+elzitvKPiLTrj/gK3kvnCOOoxhN0lcvv0cVvxsUMKlytbedd777FDKUat4BlFwQQowc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=QF+nyUKQ; arc=none smtp.client-ip=74.125.82.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="QF+nyUKQ" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-11dd10b03c6so6984006c88.0 for ; Sat, 10 Jan 2026 00:25:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768033559; x=1768638359; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=o0bY835EK0LGkX/hoGkquZtOPtlX0pdafRbSWsGphjk=; b=QF+nyUKQrIbExsjKfBgUjZSEwsMhREbdW0a7sCgC7nd6QC93K/0iFf5GKjS4VozPkB CAv/Zq/7pzlO2lZUMGamcsEbpJcmRlN6Mj6ZCO7CgDr+lN1NHlAtdQmUjMc0GDqbuXA+ RdQ03dBwCMPInuHkh02LbvOMzeDAGYBlTetpv536LmGCK/ZqVQWo30knZUgChRDLnJ1F ReNZCabvGvsRpNGze8WA1pjfgdhvjZaPRZYKVPmQxRDFGDtw8TEgDW37fQWuIkIl3/qe L/I9Ho3hkDUMPrr+1uloF3w7IMjd5kNuOI6byGWsUtV3GLAaV0hnOEH2Ay8mMlIcUNZs blxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768033559; x=1768638359; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=o0bY835EK0LGkX/hoGkquZtOPtlX0pdafRbSWsGphjk=; b=T79o6oNzLGOgGHplGvHB7bjtoQjAAQwnsgHMTi3uIUGpFyuwUHgkF3LjOP2RBcS9+b XSxnNMW9s+k9eQedujOhhZxKG7HWQlvIPZf4SwrZHp+1qA+dEGKSRZ8aImxyLRecQSVQ PUQ/xUMpvWdyVZX9ltoZ7cHce1+vYAkNIGo/jBMummYHQm7ryy5td0JKSujBD4Oyv7TU P/GblOpCsCS1pVAFXfHwtbNinASi7kFjX3JJ97rWT2WKKPXrkm8QIo4BcW8jZkmPAQH7 EYxf+JrGsKuEjQTYpArLqy+GUSQnFTf9tTZNh5IJGX2QX1Eik40mrWnLbs5GbfAlwQ/e Eskw== X-Forwarded-Encrypted: i=1; AJvYcCVLceyUGb7KcSeJcMYBK6sIgjM0OWGdvNCeFsoQV/gUUL+vA4j0fJmXpiw6iVq9/GM2oN9MFlVLJmDOZb4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0jDJCSnureQw2BnII28nhEdg8CBngMXZ1mThsjQ7X/d6oMk12 /KTOWavWKv8SCpsO/ZEFQSTFQz6RZgzI1f0xVLKsuLZyZ7sbJiw3jl6BvYsOB1ikUeetObcXsU/ mFky7iejl/86+Wu/Po2PdgxSKEtQAHA== X-Google-Smtp-Source: AGHT+IEdcJWR4YOxzDo/NKDA6fPe/N9NLHlDvsILubDvbMVZVeq/7iKvCaYf/wOLOjsHjs6CFpc094XqH7BWVgqvs10= X-Received: from dlbeq5.prod.google.com ([2002:a05:7022:2605:b0:123:171f:e390]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6b8d:b0:119:e569:f60b with SMTP id a92af1059eb24-121f8afc1e3mr10377485c88.4.1768033558494; Sat, 10 Jan 2026 00:25:58 -0800 (PST) Date: Sat, 10 Jan 2026 08:25:51 +0000 In-Reply-To: <20260110082548.113748-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260110082548.113748-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1442; i=samitolvanen@google.com; h=from:subject; bh=RBrjhm4+4Jiaj85vSZsjK0QkF6TyPfp4BVqBMhLxtnU=; b=owGbwMvMwCUWxa662nLh8irG02pJDJlJvHw3K1dx39tx5gGXQc6c3c9Od9Tr+kysmbamaJ3lu +OHy2tXdpSyMIhxMciKKbK0fF29dfd3p9RXn4skYOawMoEMYeDiFICJrORi+B9wLjq9j2VB6Snt CFHv8MMnUnlrPz8R2tXscdh1UdCBIDVGht9T7p4KeRv9//iENDZbY4lz3/fI3Zna++Zv7qKZBXx 9b3kA X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260110082548.113748-8-samitolvanen@google.com> Subject: [PATCH bpf-next v5 2/4] bpf: net_sched: Use the correct destructor kfunc type From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Viktor Malik , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Yonghong Song Acked-by: Martin KaFai Lau --- net/sched/bpf_qdisc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/sched/bpf_qdisc.c b/net/sched/bpf_qdisc.c index b9771788b9b3..098ca02aed89 100644 --- a/net/sched/bpf_qdisc.c +++ b/net/sched/bpf_qdisc.c @@ -202,6 +202,12 @@ __bpf_kfunc void bpf_kfree_skb(struct sk_buff *skb) kfree_skb(skb); } =20 +__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 =3D { .owner =3D THIS_MODULE, }; =20 -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) =20 static int __init bpf_qdisc_kfunc_init(void) { --=20 2.52.0.457.g6b5491de43-goog From nobody Sat Feb 7 08:44:09 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E74782DAFA8 for ; Sat, 10 Jan 2026 08:26:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033570; cv=none; b=YEqReq17FXTO8IK9fTx/bJpVZTs1NKfMnfJ+E3E6FQWHhdSYcuXWjpmjanNXN4kEFubReYbCsWoPnVat8zgbqaKsCxctuZ1sScAxqwwwUAcZ9WuBf8h5+3xrw2lq8zdhYQZw4hUmZR6a/iPhxlHG0+4oPGjp5RErvrY0AQl85zo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033570; c=relaxed/simple; bh=fU9tXtVUuvz++hhVpv6nOf14ncQA9HihGffXc9Blti4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XlDoY2i4/WGWlCg4AWdwrDx37LEz3qeMcO/9+/H5yxcu7eCk475mDtIhjZgF0DIkXOgGe/55EW9H4DbfWe4i1R0VCWor0Mz3i3YhhfUrTPfG3C2UeU+H1r+jcV3sU9wJcuedyMISUdcURcHDcn3Ib/ZAt5X+t+qrN2Q+Ojk4RJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1aUYk9bM; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1aUYk9bM" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2b0751d8de7so6545031eec.1 for ; Sat, 10 Jan 2026 00:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768033560; x=1768638360; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=PZhkoiS2Eo/kq3Cli8CQX1phFsPCl4naA/gjIFzyLV8=; b=1aUYk9bMCBtiYbJSy8auWrAI2DyPvbN+xBIkVdWjy+Ppe3JPx1TqgTU1UL0Zz0t2W1 xXyRSkgXR1uprPKNStP19RBOLEKEolshdB0V3J7HrNPS6gWzXDT03JDuhzBeoWWkW9Qo Z9u4XB+b2ZMB+afa0CymDJpgDPjnPVoDZ/ZHM9Az7TAZVFDCLEbw4oF5gM4P2GlrlYwf K6yLJRRq2oRqB2T1+6vzG92FaBJ2nxPWY8qG0wUhAZOtvUGleoSo5s5GpA/ILwLWXtaF 7LZ9TJJrLloXwGIIuy1eDeVflrM/l5VtgoZ8qUVwy4meTDHJ/TqUMm2A1f2JD87xf/fy iiWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768033560; x=1768638360; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PZhkoiS2Eo/kq3Cli8CQX1phFsPCl4naA/gjIFzyLV8=; b=lz53bKUUI2Mqc7F3d6QB4Qztz6UnUOyPBEySOJajAwIQ4S5Tid6RgCbz8aj3ZkQrM0 ch1yxYjyxUtO3Yc82cl/vz/dKb7HzhsFqxJvQV3xpPWo0bK//EWGJrDiBHfv/eaCWW6t vOuTDGOuASIzh1rDbuMDWnw3bd345BnuJyg5DodFFfnO2wfQL2/KauoTrKFi49GvLRlx ohHowqAicEblfE/eUbl4ec6hNQ9KLNqZ6MmPwLqfNQQU2Av0aJZRDjYPzA0D0+wRFB+s 8VmIOhP3grXQVeqbx5QaluOf3QEYssOOSokiK2jznBepkfK0O41oleekQaN7KmahGGjo htqQ== X-Forwarded-Encrypted: i=1; AJvYcCXdpHTO5MV81oJ5oCKC2ZmzYuOwvFf61uJyZRBHMrj3d/7U1JI8YXD2rclvG4HypAdkym8J3g1z8lzNM80=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0bT5pq+YhWjiTSYqnYVAC/oMWLbXprJcoB0XsWs4gVEte3n44 GPLBBJsrdnPDmEDXaMT8SiZvkjdEOQYZGaEZPepLzbdjgVSh10gMPfCg4vbEDjiuFjLLb/o8Hp/ y1REzm4R6NAmhyxnhrsMKdIaiJjVUkQ== X-Google-Smtp-Source: AGHT+IG9YKCSq7wS7f0FWH0qnCPG7v4Hjw/ILCg0+RfetXQsjFo9F+6oxi8SmQfwivw3ZF8EVRkWhSbDDRqzXAdk+xg= X-Received: from dycog7.prod.google.com ([2002:a05:7301:9a87:b0:2ae:3278:d74f]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:e9d9:20b0:2b0:582e:fe51 with SMTP id 5a478bee46e88-2b17d2a841dmr7814723eec.20.1768033560093; Sat, 10 Jan 2026 00:26:00 -0800 (PST) Date: Sat, 10 Jan 2026 08:25:52 +0000 In-Reply-To: <20260110082548.113748-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260110082548.113748-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1607; i=samitolvanen@google.com; h=from:subject; bh=fU9tXtVUuvz++hhVpv6nOf14ncQA9HihGffXc9Blti4=; b=owGbwMvMwCUWxa662nLh8irG02pJDJlJvHwP4ydbut2RMjnQ9ODCnS2OKqy+lja+XC473u2V/ rt9QYdSRykLgxgXg6yYIkvL19Vbd393Sn31uUgCZg4rE8gQBi5OAZiIziVGho2HN68R23FxSueL Hab7bx5u1xBQ2VO556dvY/lcnR5Z72SG/xn92xL+WF+wn8H//Vi40D6OmGk7HFhWpV5am8jbL5f yiQMA X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260110082548.113748-9-samitolvanen@google.com> Subject: [PATCH bpf-next v5 3/4] selftests/bpf: Use the correct destructor kfunc type From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Viktor Malik , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Yonghong Song Acked-by: Martin KaFai Lau --- tools/testing/selftests/bpf/test_kmods/bpf_testmod.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c b/tools/t= esting/selftests/bpf/test_kmods/bpf_testmod.c index 1c41d03bd5a1..bc07ce9d5477 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -285,6 +285,12 @@ __bpf_kfunc void bpf_testmod_ctx_release(struct bpf_te= stmod_ctx *ctx) call_rcu(&ctx->rcu, testmod_free_cb); } =20 +__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; =20 static int bpf_testmod_test_3(void) @@ -707,7 +713,7 @@ BTF_KFUNCS_END(bpf_testmod_common_kfunc_ids) =20 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) =20 static const struct btf_kfunc_id_set bpf_testmod_common_kfunc_set =3D { .owner =3D THIS_MODULE, --=20 2.52.0.457.g6b5491de43-goog From nobody Sat Feb 7 08:44:09 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CEA31ADFE4 for ; Sat, 10 Jan 2026 08:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033565; cv=none; b=trTMuZEpM2Cm/jBMSE7+I1JLlnN0mC1pND0664BE8Vq2CHjve2Ia0SPuew62RXFOZSQP1ZEQNAX7V0Vt/8130BCWXjYufa+dauuT2KE0qYwzDPmu3NuOIIwoeSERP9qFlKYscBWF6tNPfG0V9Iu2fRuH83fTC4ucEFzQuZBVG6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768033565; c=relaxed/simple; bh=whKXq2UaWgwSKq4RZq/7tWTQr5a1lYl0L1Z4K3S66gE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GqNHHLJYHS2phan1v40gLSWGETJIV6Fx2GwTqEa9FsQyaD1+XQ+KlJgwlzFVmCIZLszoWzvHkdaAEL1YC7T/kGHaEjiSwVqwMUVvLM/7ShZEer2o8Zj5PUoYg6HnBA/0qr1CXNM0BdwpWUDWpAdYCjkjwI31RKgDkZOEHfZE9j8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Dq0ffHx8; arc=none smtp.client-ip=74.125.82.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--samitolvanen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Dq0ffHx8" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-11f3d181ef2so24040218c88.1 for ; Sat, 10 Jan 2026 00:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768033562; x=1768638362; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=449w4GO5uhfdBtS4/XTNprUslLajoNDu3/A2T7RPjYg=; b=Dq0ffHx8cuxc7SY5L5uSAO9W09tvZVV1zjpxbrGWKNph+tSQvrhSnvHTJdCyYa7ahQ asNsPMHxD2NLM1HgnehQEAyoJDntDCpa06rvdR4pK0PxCqwHJA2w7ZHax3D/A3MsR6M3 jmEXqaAEMdli5A2jLXwak4pzsO9+dIi/3ADms2G4lPJ6TJmhSogzmAktU8D7uJExn+M2 gzcn4zG/FZ6Ctw7pMccN+9pYfvbT5nuOImJfJ1ICWuomDLGFsPW55nrBW9djo8aOprzm SybwU769IjL70JJ1OLjrPLqf9SiqW/SgQmbL3XIQCsFe0OSmnXfxW35CKDKrWyN/xtaE hkKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768033562; x=1768638362; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=449w4GO5uhfdBtS4/XTNprUslLajoNDu3/A2T7RPjYg=; b=aSb+hdN+8yTCdJWdX2F0c+CrAqfxGJWEfZWRJIL7qL+KriVpRDklOIxJ0q+JB3SOdp IylEd8vjMJyI04CnYcTGTaVd0blOOXNQ/JThT7dVQ0j77DZ5TVTMIpQ6LsWyhQSmElHY 6DAovLY5QDQ/dqy4Y8PcxrdyktreiAH9tugs1b18J177/WoZoe/S7kCX72UiwNIiBB9J l8f2IhA3LSdxtnVEIDBZ4Kulkr3jYYoIvhjs0QEnCex0F2KFpxMJE9nB1BwtWbElaI+/ J+HGhDrwRARwCWO60PodQWIpSBNe8/mUoGLPzsXX7D43vyDAdWBNeDnYX44OGdeNQFtS Gnpw== X-Forwarded-Encrypted: i=1; AJvYcCWjZBqsFJOW9IUdoQgCfQBYSAHHcUjig5ijEOWZBTr4dXb/iqqIwwjvf8kLNmzkuq0E03Zm1E85EPk5NjY=@vger.kernel.org X-Gm-Message-State: AOJu0YwfWZdv76OMrOWCnEfLhflhoyA3FvKubIOAc+smOcPQdI3HOOWe 7u6KxMFUByEfz3swjl9GPgj9CItAyh61lWYKOzzdySii1cqVkSVJkAa/YVXT1N4kgdRPNPvSgi4 Gkt9Lmvl3Mptf+JSfVkuM0Z4qeLCfdw== X-Google-Smtp-Source: AGHT+IFmCO0K26hEWmtQlpwGJLRbVYg5Bg8Mr7O4+TQDB1V1dghyXNnxJOkHNounSDF02rQTVtkHOfl1+QITfS5Xnp4= X-Received: from dlbdm14.prod.google.com ([2002:a05:7022:6b8e:b0:119:9f33:34ae]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:791:b0:11d:c91e:3b58 with SMTP id a92af1059eb24-121f8b60617mr11760954c88.39.1768033561654; Sat, 10 Jan 2026 00:26:01 -0800 (PST) Date: Sat, 10 Jan 2026 08:25:53 +0000 In-Reply-To: <20260110082548.113748-6-samitolvanen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260110082548.113748-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=898; i=samitolvanen@google.com; h=from:subject; bh=whKXq2UaWgwSKq4RZq/7tWTQr5a1lYl0L1Z4K3S66gE=; b=owGbwMvMwCUWxa662nLh8irG02pJDJlJvPx6jzfYi5ROYond+/r3wTd7whiz1s1coLJkX221S tIdxp7THaUsDGJcDLJiiiwtX1dv3f3dKfXV5yIJmDmsTCBDGLg4BWAiSoUMf+U+2kytUlgbn771 1e2DYdc9iu3fc2kYTlac99+n55y7HAvD/7wZXnxBn/MWu77TymXu+3dvYU/leh4LdtVV7+0VJ93 M5wIA X-Mailer: git-send-email 2.52.0.457.g6b5491de43-goog Message-ID: <20260110082548.113748-10-samitolvanen@google.com> Subject: [PATCH bpf-next v5 4/4] bpf, btf: Enforce destructor kfunc type with CFI From: Sami Tolvanen To: bpf@vger.kernel.org Cc: Vadim Fedorenko , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Viktor Malik , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Yonghong Song Acked-by: Martin KaFai Lau --- kernel/bpf/btf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 539c9fdea41d..2c6076fc29b9 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8846,6 +8846,13 @@ static int btf_check_dtor_kfuncs(struct btf *btf, co= nst struct btf_id_dtor_kfunc */ if (!t || !btf_type_is_ptr(t)) return -EINVAL; + + if (IS_ENABLED(CONFIG_CFI_CLANG)) { + /* Ensure the destructor kfunc type matches btf_dtor_kfunc_t */ + t =3D btf_type_by_id(btf, t->type); + if (!btf_type_is_void(t)) + return -EINVAL; + } } return 0; } --=20 2.52.0.457.g6b5491de43-goog