From nobody Tue Apr 7 14:38:07 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 E4E553FFAA2 for ; Thu, 12 Mar 2026 18:38:26 +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=1773340709; cv=none; b=L1DUjfvOSLozXHUNyrXuvuUsdYh1waBDGQuOUwwl3uI3NpFNyQ3beZ/9Zc+7jOXidj+BIYZs1PZF0MHyIatBnQ8SpXiAEZrMxQTWs9qRKq/JkU+JcAvKHSiqv2nrerQy2iHktLiXg0jS5dtHHKcZpEtVn7HVCILHZPs0xdZe8xw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773340709; c=relaxed/simple; bh=hLkQy7+v7sIoeOptbeXzEKr0KhHSdLM8ZkXMOp0ID+w=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=Xs4ar3ASnnKYwMXDwHLB4emHkN/n1d35VSRdosoBV4TbYXVm5dhaJ/H9WuzDuhbX68TKO5rYVQQv/gR7DIlRyLR6x0bPelJC8v/fvmDg3TGKMatfq7wvW/a+MHOyNipntB0vfVyJYnxspvjeO+eXTiBTnnFpqXn0MVHRh4NWQVI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--cmllamas.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=xZopyF8z; 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--cmllamas.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="xZopyF8z" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-128d0b690feso21066499c88.0 for ; Thu, 12 Mar 2026 11:38:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1773340706; x=1773945506; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=KT+Cg/BPmj/SMGun4ECKceTmOYFTBDuXe563CTI88nQ=; b=xZopyF8ztcZGLBzhd6n67x7WlHA9l54zKAi4yc2lcRXqJOho0H9UQ21OwsTbyz5yqD +4wXgNbkKENEiXiyc1fk+sY+/QkIZOtHTDCxQXCVxPjHHDqkTpxAF3roQ057fHfSq1PD hh+cuCdoIE9CwrbCF2i0XW4lKCH9O/UZqOwbYq5oTBQ+/zXQRe8hADEkSof0hWMAcvVZ 9e5jV6bWvnaLweCAXK9XCd015naLrBrLE8Qt8JWvI4aZIeJRi1Jt7SKWd7ujl4SU+38P meMuf7iZotBqLaEjELqi07AZtzcvCqoae2jn3/5hIILFVjndE/I9+GpkQ8zKRC8QadzL 6KmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773340706; x=1773945506; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KT+Cg/BPmj/SMGun4ECKceTmOYFTBDuXe563CTI88nQ=; b=PJx0htGGkkTU04+CgRBt+mXJA0Hz5y6z7YwjO6KUEFBpgr6zVvmGSms3ai4yt0HB+M p22qhCcguQXBtYP/n0pdcajJYRXMmWFnaNzoGZyIVob7a4bFapHd1jrFucD6BdfE+lvw 64iOMro6eJyJWpsvELG8jE9lknYT7b2mBGNAulqZGKnXZbDUKSgPP3Wab68HKvi9TdM6 6XI3TfTLe9xFjjeX/dS0P/MUnrKpcaUE5oQNDjuwc3iW1tIC3Y0wa1t0qt9OL84wsWYj e46f/OuK9HMtRt4eReq713NQxB24EqiadBke6LXmf1liH0klqtPibOnr6NwDs3iPSTNq crEA== X-Forwarded-Encrypted: i=1; AJvYcCUGA0ym6E8dxzxvprdagzv7LL5vVEF+EHq4VOQpbUMmpRo79b1wlIglEAI3/tgXEjtkDCJSaNmqsnu8OJ8=@vger.kernel.org X-Gm-Message-State: AOJu0YyA/so/byCrdGTg7q4u0MZhdGntI99/j5b2AYQc+dIPZ7WiKTIT LpHU9EDRbSGMv5a0j9lj1Gs8SBqDiijmbykhd5u9uPcMLMoxMXBgjQtzCro6WfBrW4tjKZAVZ4S JtgQhSE6vNCBUug== X-Received: from dlbrx15.prod.google.com ([2002:a05:7022:170f:b0:128:d24b:8ac7]) (user=cmllamas job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:925:b0:124:8d5c:e46d with SMTP id a92af1059eb24-128f3e373d2mr259512c88.43.1773340705709; Thu, 12 Mar 2026 11:38:25 -0700 (PDT) Date: Thu, 12 Mar 2026 18:38:17 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.53.0.880.g73c4285caa-goog Message-ID: <20260312183818.2721750-1-cmllamas@google.com> Subject: [PATCH] bpf, btf: switch CONFIG_CFI_CLANG to CONFIG_CFI From: Carlos Llamas To: Martin KaFai Lau , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Sami Tolvanen Cc: kernel-team@android.com, linux-kernel@vger.kernel.org, Kees Cook , Carlos Llamas , "open list:BPF [BTF]" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This was renamed in commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI") as it is now a compiler-agnostic option. Using the wrong name results in the code getting compiled out. Meaning the CFI failures for btf_dtor_kfunc_t would still trigger. Fixes: 99fde4d06261 ("bpf, btf: Enforce destructor kfunc type with CFI") Signed-off-by: Carlos Llamas Acked-by: Yonghong Song Reviewed-by: Sami Tolvanen --- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 4872d2a6c42d..84665f76a3c6 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -9003,7 +9003,7 @@ static int btf_check_dtor_kfuncs(struct btf *btf, con= st struct btf_id_dtor_kfunc if (!t || !btf_type_is_ptr(t)) return -EINVAL; =20 - if (IS_ENABLED(CONFIG_CFI_CLANG)) { + if (IS_ENABLED(CONFIG_CFI)) { /* 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)) --=20 2.53.0.880.g73c4285caa-goog