From nobody Sat Feb 7 16:00:11 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 --- 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