From nobody Mon Oct 6 03:15:56 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 18A74253B71 for ; Fri, 25 Jul 2025 21:44:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753479865; cv=none; b=U9NyCwyQqLAsTR5Pn0CQX5qzLDSdBybc2AkgndkT7xNxNIbctk8/+WyA6rq0vSPpndrUrSFMarVnDr0RNcVibTaTjsWeJZgiTu43cjfFKfgfnTXJFd+0hX9vv3KNccyj+SUzhU6WeZnpD1WslPuZdS02V+E2JTjeNKIfQ9gGu9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753479865; c=relaxed/simple; bh=4N95PHaH5sTwnPpy+bRhfgpn+/S4W3TV/v5oApqGZh8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uWh7G3m9NHI0dtvZjKk4hIRVq9PhI4eq1pbVlFRlaBbH6XgHZ5DgiFo6SW90SffvzkaGwWKFOXpdO1ZeM8oQh8CF2503j3DU4E13xM5YJdVJl+jKfgMr4iAavSgwDVzDF9NLIum8Ho1w2HRq1t4OFwZ5OPcJaJmciqTYDgIs1H8= 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=E4vgcAjh; arc=none smtp.client-ip=209.85.215.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="E4vgcAjh" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b3928ad6176so2366629a12.3 for ; Fri, 25 Jul 2025 14:44:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753479863; x=1754084663; 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=l30q4xjgSSq02GIRwkV5JkxzVEDFHasp0ZpBbR5DA+c=; b=E4vgcAjh3/d6QIa1QrCAD5Z14jDOiLFTxWVtj23ENMutfs/4T6ogUA74HyBeCf6QRB O357dV1oz5L3/s/Ecg5N4EB9mJOo12XULyX6NFEwktlpIM59UmIvZ60S0aENFlRXP894 p46biJXreOoLLoH6Ie42tBjjOaHng5BQ6ReF867OxqYKvu/ozo4dd2g8lilDghlUFdlb BrvrQZJF/Y0PMQK2VPft5U4M9GhyFUta1dyPbGOISw3BYIsRHiOxaXPU96H+GVwddWqy 57otjQa+vMx22nhx2ARdXH+yy6TlDnF/+zC5eoT7JjbX+gDqsZrIB4yw7sTvoZaXtpoR KHQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753479863; x=1754084663; 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=l30q4xjgSSq02GIRwkV5JkxzVEDFHasp0ZpBbR5DA+c=; b=E5vkzxYfrjUnTyIHl7pGdgI0uQF2n3xMwBesPfVSa94nxHvg4a8pwK7Na5Dzqriedj Ftvpz4hl9naOco56FbGSCl8e4iDB86gqFdr5sdCMdlSbjAYDkEbB9upr20GER7mIaS20 DUwSoK/KB1Ww1qvnB6HmzNVHrMixszYBYQFa+HIpXmojBo3Zo4ia5Uiens+vltXLtAoq pxP6K2jqhT+xfM3UowpdMqkPYjwB4F9Bq3swz98BsqfHR6hBalAaKWFFTUw02KtfYKFO uRDsDMZ7fbF+ZVmysjDdMhTaOMMjeRqLAxp/ridpBULHh9dTo7Xy4GIfmzTTkfhCYD2B rALw== X-Forwarded-Encrypted: i=1; AJvYcCX94E3+ytMxcvHk0Awg1nswQn/L8bnBeZd7xx2oB6pVtyQIXHzrnNYHayENxL9YmHjm7f6AKB4LeER60ik=@vger.kernel.org X-Gm-Message-State: AOJu0Yxl06HsauFH31TiI/WPgC5rlDf///FeJqFvquxPBbhMvSeL0jsz N93tWHq/4OMA5l6558WEBzGEbrvvmt1FnmhyQbxEGrvlEfodG7tqYTC9xCPfwAi45fvAVVhvX7r 0gDfmeOOMGU2JJG/W+euG5f3eINrM+Q== X-Google-Smtp-Source: AGHT+IH2RmYkNP5u1YAotNL4rM7ZeCOu/AMOj9VOuB47c3yjiujrMv9Bt7p2q0nrdOaoANv0rCoAFl9OMd22HLgNjxw= X-Received: from plbld13.prod.google.com ([2002:a17:902:facd:b0:23c:8603:9e00]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:41c1:b0:235:e8da:8d6 with SMTP id d9443c01a7336-23fb3050a7cmr55292785ad.2.1753479863418; Fri, 25 Jul 2025 14:44:23 -0700 (PDT) Date: Fri, 25 Jul 2025 21:44:06 +0000 In-Reply-To: <20250725214401.1475224-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: <20250725214401.1475224-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=853; i=samitolvanen@google.com; h=from:subject; bh=4N95PHaH5sTwnPpy+bRhfgpn+/S4W3TV/v5oApqGZh8=; b=owGbwMvMwCUWxa662nLh8irG02pJDBnNvxYfqK6uYuzr3vB+Q7EW85RJVqe0m9aG/WMJmGv7W u7Ql76JHaUsDGJcDLJiiiwtX1dv3f3dKfXV5yIJmDmsTCBDGLg4BWAiTt6MDOs3y1o8sDI/HfW0 5vwd6c83RMwbXjlsZXTZuYv3bleiSy0jw8VaAaa9Ro8KVbdL3hJfqnTB4kaC9QLufzN890hXWZy czggA X-Mailer: git-send-email 2.50.1.470.g6ba607880d-goog Message-ID: <20250725214401.1475224-10-samitolvanen@google.com> Subject: [PATCH bpf-next v2 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 , 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_CLANG 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 0aff814cb53a..2b0ebd46db4a 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8856,6 +8856,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.50.1.470.g6ba607880d-goog