From nobody Mon Dec 1 23:07:03 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 EBAAD2D77E9 for ; Wed, 26 Nov 2025 22:17:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195459; cv=none; b=LuyrExcy4Wbwr4u77WD4UiwUSlGgDz9yA9FnbVfJbIi2wl+CJwI6EAl8uB3Eo0T1/AmSFWk0e58u1rsiLMjcy/8wwiB6E1XZzckMPJjRmv2mMUb3Pg4nlnWh8gs5IrcRuY7pIpFpg+qaGfZNEAqfmf3DPfxe+ollsFIFG+aGU6s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195459; c=relaxed/simple; bh=WoPr0D480sRfz6MWlBIwr0fT3bxHa92NetIHpnkS2K0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JVXCpXZBDauCmMiHTbDPR4tS8iuMcfIGU/keNLpuaRZifQhyPpu7HY6jXn1I+mcptKAmIieEyCrayx8Nm7M/HtoN9lOkReqerHyGeHUCrohzn5Ar5etePFicN9HSJuHPB6EQf2FKrMNEW/MRbc5n91C8G1dJBcUI7k8/zTqk72w= 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=lgX7RuO7; arc=none smtp.client-ip=209.85.215.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="lgX7RuO7" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b969f3f5c13so243016a12.0 for ; Wed, 26 Nov 2025 14:17:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764195457; x=1764800257; 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=rsdGxAHy7+Lr8WP2LpE73bfJe0tYWCB0gy6QVRcQ+0k=; b=lgX7RuO7SM7jiqM614v6//XiOAUOAV8QkOjwNyL1PN6upp8KGWCoOLqH9qZiRG5ZdU PMJzgRGNHvkNvZqL+gln6DNlxlSNMCTQDqN9tsS2/vrh5udt0SxBmnNy1ddthB7RHf/u Gd1vrwwyXCY+2dnnabFYjigwG/UXIf7fuX7x0IGxT1PPrVP/WuKtB49/nVnQKGZa+vFe 0r+JUQr82cHTXDM/PgkWHaZ6DrNf0d7eaTLmtDOHWfMCXcwu9pN7NUwH3Nt8y2JvykIg yxDrHnLhc2FQRq8XwD4b6q2AMuUR3PdoCINUp1AT+46JnS+Vaj4ew3vnDW8XAWyG7PhU PQzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764195457; x=1764800257; 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=rsdGxAHy7+Lr8WP2LpE73bfJe0tYWCB0gy6QVRcQ+0k=; b=lOP1DAkAGtxoUDASSptIf49Ku8DDEbX+hwU0MgEOdPqMJrdEOFXQnZMTj0VRBzp2Gk yzQJsmLElfapNAGsowBYaTtOY71207/6rtBtSDsyohmJRv2SJUJxPQh6qwrkG6N07q3m Pr8Emw2U9HsU1YeYDsQpgUWTIE80vwVOzIBA8nb49DyUy6gRwNP3JZ+9fAt/IJgn/RMc aGAjHirmrcnl7Kreriis9Ki89XWzKd0bgTR+yjM8UFvVTz2PUvG9ZVaDFTvYaVsq32h2 6ueqloHDWCCv3hMcQwxnc0hr7jmfOX3k9xDgQhDAuzh0TT6NYlIYuv0iL1MmcNjPDQhs A8SQ== X-Forwarded-Encrypted: i=1; AJvYcCVYl4hYK8I1V53IOiTvhTk3VCjyEJJ0zrv5foR7ph6gBCJUuawNGMM5yeTRXQkCrwOu4awlF9rwUMLPOjw=@vger.kernel.org X-Gm-Message-State: AOJu0YydVzDI960Ozn8YxeMmF4zM7prQrlS30CE4OTL9zNgvk7LBdjbG SaZa7tU4VQRUVjB7H89ECbuVTBZGdQ7/C2JsKExZCuP+Us//p5jigXQcWVECGed6hGL8NtYhRwt XGzX0UteINrMnbsbB+AbicX/aZ5U0ww== X-Google-Smtp-Source: AGHT+IF+NJvGtMUf7g2ELzHlH7eqyOms5MRbRzRX3sg4jry5QurPb9wZ/lrXsK3lya/WwBfrnvChARM33YajCsYgIpg= X-Received: from dyu1.prod.google.com ([2002:a05:693c:8101:b0:2a4:5178:f11f]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:1014:b0:2a4:3593:4664 with SMTP id 5a478bee46e88-2a9413bc7a6mr4857020eec.0.1764195457160; Wed, 26 Nov 2025 14:17:37 -0800 (PST) Date: Wed, 26 Nov 2025 22:17:29 +0000 In-Reply-To: <20251126221724.897221-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: <20251126221724.897221-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=WoPr0D480sRfz6MWlBIwr0fT3bxHa92NetIHpnkS2K0=; b=owGbwMvMwCUWxa662nLh8irG02pJDJnqNWU2kmKOZhdXtB690uwVv6L7v/qjOgFzz7NXjD6c4 70U4b+jo5SFQYyLQVZMkaXl6+qtu787pb76XCQBM4eVCWQIAxenAEykWJjhf+ZlF/E3bzy643Ji giKXMGbbsbQEtv3YtzD8QWH2In6FTkaGP2E/gr+r6dbOXqv6v/CVpvabbQ2mapNV+Nzi+m7Z8a5 kBwA= X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog Message-ID: <20251126221724.897221-10-samitolvanen@google.com> Subject: [PATCH bpf-next v4 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 --- kernel/bpf/btf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 0de8fc8a0e0b..0346658172ec 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8845,6 +8845,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.487.g5c8c507ade-goog