From nobody Sun Oct 5 23:57:02 2025 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 984092798EA for ; Mon, 28 Jul 2025 20:27:04 +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=1753734427; cv=none; b=LVVzzheQjMz3gWPCFliFhMOBA+g58bDvO61wQurodCQZimV9SQuL+YJt52so/r/LpS3JEcMEaiQQYxKQVHTP0mGIwFlE5u/XCO2ivDQAGEcRqqGnCRQ4X65rj/UgKrfioiaOdwkC7un7gKivTYVrqxik5BEXjCRsO4LhzgWwZDg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734427; c=relaxed/simple; bh=E9W3hDdjKqG0/Dcp7x3HPNh9f9/drXiGUgTBhKvyi4Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jdRZQjj4ymA/Ru7/2zjZoeWvZkN7Bx4B9H8oEKGCEA98OvyxsQ6Gqm1EBcouVvlZTjnxZe1CtrVpmEeL2BgF4anLKG13IU+w0DzBEBzsgtVPQwRovMzab6wvq5uAP1x3mfJSGOP1x9uK87aM4ACVYF34cZxdnN7qohOGDoo8d1s= 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=JL59oUP0; 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="JL59oUP0" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-754f57d3259so7714393b3a.2 for ; Mon, 28 Jul 2025 13:27:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753734424; x=1754339224; 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=lLsarPvPIbFu1ICXlymwwoKbhdf3AVPS0/0vmdmjJ+s=; b=JL59oUP0nQ/qwImgEa2xD4spm/ix3JFZc+FnUPM5fmdXICjjiD78YxWU+5difsCWfl iiT38fJ+mFyRITevkBh4LIW1uDMpyXN+y+JMsSiwIgmzf07gyEB9rvop8TZ5h/JOgLkJ AFxqjC6XbggcFomDeMamx5JqOlmF3b2PN+hqZRUK0Rqk8GX98He5XllZglZu9SQ5DvZt 7fF5zvCy4226PEEiDK4+599TBQ/gL5ubKNtGe8fOvXLzH5m6SITwZQeJzWtD3EKaR/Ht BZUeeb6zHwgjSbA0TuzOhdFjTiU+TF9SJ/FilVJzZ2kj8Anv58cl7DDrDdkqZQtXlbkk RzpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734424; x=1754339224; 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=lLsarPvPIbFu1ICXlymwwoKbhdf3AVPS0/0vmdmjJ+s=; b=AV6UO3DRstL7h8WCNXxjghRDVGKvei3ph5uvtZbG3DtcEKO+fcYDNQrtugswLEPa2d Dg2C1fTRucVZjyGG6dwZ4eICTPFad/bopUdqZrmvUiiZIaJsCvBqyyfPZvtbWHs28wat fSIk79b0GmmfR3tbXksZeKpw5gdZ6jAUl5/ko+lgIj9v8XHnwAtIH8hhswQqkyJ/K+Hw x+fwbPhF9qE/WpjM/uRu3ozhf69cEvKFyi+1lystXsMjhC6BHZf6dhJZW02RRBEPRmGj oxkaMftBd7VeSgD7CiMqd1S0Y7zTMZh5RT5H5fcU2hrg7EX44f9JUlPu/My2NuVZ+Nyr DZbQ== X-Forwarded-Encrypted: i=1; AJvYcCWX9b/8iRjOKw7zrZcZh45PTBSUoZDSl7UOFQamPEBYJT8Z5vOrFb2H/SL2oo05+1cnctqMZELcy9fvikM=@vger.kernel.org X-Gm-Message-State: AOJu0YxWYInacj6GBR9I8YM+fI8JHcxNNMHeaFlJQaELoDdFhw0qop+I iwt7cIYTUgzD9PQlqUpzKFE4PbSMHbmrO4r1kfBJ0uRu5G88UcwyxmCm/HEFFZix5aaMN7m5JC/ OhoGzbPKsi+Tw6XhoCL5QzUogl2LdbQ== X-Google-Smtp-Source: AGHT+IFudBMyeFqioTrXVFHd7dr+LUtfkeYFvZh2ukfAkFHnY0iZGi5DHLUxmFcl+BBe9j6zrfFp4V3RN0/7Yz1RG0o= X-Received: from pfba2.prod.google.com ([2002:a05:6a00:ac02:b0:746:1bf8:e16]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:99a:b0:736:6043:69f9 with SMTP id d2e1a72fcca58-763349ba196mr19216523b3a.19.1753734423880; Mon, 28 Jul 2025 13:27:03 -0700 (PDT) Date: Mon, 28 Jul 2025 20:26:58 +0000 In-Reply-To: <20250728202656.559071-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: <20250728202656.559071-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1700; i=samitolvanen@google.com; h=from:subject; bh=E9W3hDdjKqG0/Dcp7x3HPNh9f9/drXiGUgTBhKvyi4Y=; b=owGbwMvMwCUWxa662nLh8irG02pJDBntdwU9F3BPfC9rtCPfpHji+X/XJlz/vbmWibGm2azzm t+fntDOjlIWBjEuBlkxRZaWr6u37v7ulPrqc5EEzBxWJpAhDFycAjCR2HWMDDMerZi/uVh4jtj6 e4+1yjMMdFk+Kay+N+GDObebxPT1NWsY/mctsPzI7ekzc8M+zZ7vhTe3l3btsk9T+3Gwrzf+wvE pFowA X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250728202656.559071-7-samitolvanen@google.com> Subject: [PATCH bpf-next v3 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 , 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_CLANG 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 --- 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 94854cd9c4cc..a267d9087d40 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.50.1.552.g942d659e1b-goog From nobody Sun Oct 5 23:57:02 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 1EAE827990D for ; Mon, 28 Jul 2025 20:27:05 +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=1753734427; cv=none; b=hTQk/DQNVIb44fo31DQt6W675TiziuqoJkQ2LQlbf1NFphYdJtaMCNUH/gmZdedQc0gTa33eHnd3+NlQkOojWekohbTeqKCc8B7RISvfRGk2r+Zl6atK2VifdFnnlD1E8i60nXlSKR9SYfQ/fQdhIw2oMOmQ0L4V8WEvyEa62go= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734427; c=relaxed/simple; bh=ktAlH1M1bwslpXGeLgOgITzIdzrVmjtd8hLrz38oqVA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ol6sMR0cFVO4/fFRTeuVsyT5+L3NEQ/4cVpe6iZHk+1BDKrOjqa8r/RsOmc1vfuASdB6lwggwoxu6vEglw1TO0eaE3WbU6m+e1UcwQZx6DHcsgVY8ii7WbYcQWUL4c0GgF+6KGtPE1amG5UJVSu3mjSDTtCwCeJlrF83pzvghVo= 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=v7vC3+tD; 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="v7vC3+tD" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b3f38d3cabeso3473057a12.3 for ; Mon, 28 Jul 2025 13:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753734425; x=1754339225; 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=I15NAgyj4G+O2vviAcC/bqIuOaat3gPUhwCYB7reS1M=; b=v7vC3+tDqjWKK7n9f+ZYR6n8z2rv4hMWeWWn5cqALBpWIeyDFnqAEXTED1TLHLh+hQ dt/YYsiFJNTzA3RKPixhgBCItLX7LYSavlArkkY8c8zUKAlr9OtetWwfIh7cFm1AzM3A zP5GAigWR8bdA0xxGg2t4dVgMN0HATpnLOfO9/3WWq5o3XDydDb6f9piO2WWqp0PO6DF kHe5v8tB5nSdtIqBefnT1AmUV0nOAz3D+S0rxexrY0vYUnQHcsoer5DpaRbq4BQGOFb6 2H/UxvyfluH70/GNci8m7ySKt2oqDZ5VXFbMEq4Flr+bezQwAuiupdmYn39HwGxTNXQk ESfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734425; x=1754339225; 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=I15NAgyj4G+O2vviAcC/bqIuOaat3gPUhwCYB7reS1M=; b=GhYAueFUjTxe4D+KYVIjJZoxvCq/TvinQqFwUp7TtwqiAVpw0M7rKIJ/Y7i8pU8UU8 fnfXuKjPLtVivd28sY4yy+LDjenbUJ6beg7R7omQDVJ7+gOXo27qRuWIDIFvqTVmyBSh BxJFmjjWncRl8Mnf1X0iDpgsn3mViFxN6cN85MQ1pLfRz7FAQcUph3j1ysvhElPfZTPt Z5syGorslULYjaflP9yzEMYer27pUl3tXEeKr18FpHzHetGnK9iMx9k4LqEYOrTq4lnf AYawOJBqOuoxwrEQDi0sKTWEozHvjPq4RhQmAmbgYzhuxddXZHBsXTGF5EXqH8QzqpBh jSgg== X-Forwarded-Encrypted: i=1; AJvYcCX4sKCZ7r25PhmGW6+0YU4gz3ulqDk5ja4RRbZMXE635tsFUouKLXRBKPZILLtWPiV61ArsdTnU6Xv/9C8=@vger.kernel.org X-Gm-Message-State: AOJu0YzY8z/vyUxn8VdgEeI/yxV4h4QsxFpvyLHKo7wbyafdRLJTPm+s SRVgQ1fA5X2Y3BX5jAj/zUnXuwltJZrFHKE5a693RUiel/xSiR3HkMqtG8eIhmMo2/pHxQQq6Fe TJlLuGk6BUBpMmL0A44d31kYQUy8CJw== X-Google-Smtp-Source: AGHT+IE9oi+ffPcXx6AWpN5iqCz37jlrkj8cFjHkHGI/j9wSGEXIJvDh1Xjdzq2liHFVloQZS+o9kxScpZhIDXhx+WI= X-Received: from pflc4.prod.google.com ([2002:a05:6a00:ac4:b0:747:af58:72ca]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:a49:b0:23d:798b:d290 with SMTP id adf61e73a8af0-23d798bd3e6mr16913294637.29.1753734425520; Mon, 28 Jul 2025 13:27:05 -0700 (PDT) Date: Mon, 28 Jul 2025 20:26:59 +0000 In-Reply-To: <20250728202656.559071-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: <20250728202656.559071-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1397; i=samitolvanen@google.com; h=from:subject; bh=ktAlH1M1bwslpXGeLgOgITzIdzrVmjtd8hLrz38oqVA=; b=owGbwMvMwCUWxa662nLh8irG02pJDBntd4Ukn0y/9qCzwGzzswmJXyTyGp7qBx66Ism8R+D7X 6+HLkk/O0pZGMS4GGTFFFlavq7euvu7U+qrz0USMHNYmUCGMHBxCsBEAiYyMjxi9JgdvK3x4tZb ++ZNeqSj+437kfkqzf8NColvf7v+XL+a4b/3WlNt3vIFcjNKeFktr7Xaf9Gf/k7nunm5ROKrrVO cOHgB X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250728202656.559071-8-samitolvanen@google.com> Subject: [PATCH bpf-next v3 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 , 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_CLANG 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 --- 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 adcb618a2bfc..e9bea9890777 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.50.1.552.g942d659e1b-goog From nobody Sun Oct 5 23:57:02 2025 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 EB80627C154 for ; Mon, 28 Jul 2025 20:27:07 +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=1753734429; cv=none; b=HTr2HKepSen0R84w6drLyRoK70bdSGtzPrdORewtb6yApJAjzzsimLDWrS9TkVSVYHvxh8kNhExrhfirO/8iBrUVO1F2OMnMUJP82+SrDPu8451jdCTNpjvAmJh3Tf/i9VLCNxtv/bSXIRYN/O4qiTW7faf3eJmn7C4rC+D2o4Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734429; c=relaxed/simple; bh=g0N5jPV0NJVbr+uE4KyzNHSLwLqm3nr/w2I6IcG52p0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=W1AIzs6VDtTWWDvsdSY2YgaT6WMO1HUeAI4I5XxB8U11hLM84RspM3xhKsahTazE0BUQ42f+3G+8n8HKOta7M9cRv7ts3O0bxPpPDos0OTSnGlosmNwA4vKui/7wfrjxohU/Q/UnQkkG64FF9H8A2oBhFMbp/hMF0FYSrziYYTw= 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=bN/k22w/; 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="bN/k22w/" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-748d96b974cso4375155b3a.2 for ; Mon, 28 Jul 2025 13:27:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753734427; x=1754339227; 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=p6DeVgk8XdY332rGP8e1Y9P9nqTYTkslVRnaqoYpg6g=; b=bN/k22w/oDorOExKpBkoGXHGjgyNQ93q6vG0dDptzhE+tLPVINoXtLcVOh3+IJ8b+C 4yNY2hQQU40QmcXM+kWBPPi7My4Pqj+KvcISlgAT/3ML6UtsqOPHh41WmqrZE3QttGGh qogZwVHpRm1ZnpMmw+sbsBleo2b2j4+6dSKbA5rEyoDNviERqZiF6Cy8kS9eE5WaLBiY ftEz7WgKA1z7pwFxJFNQGSASEHTCmzY1xwmGAWNHY4xaDJ0sZHzUtv1eunL43gquYfm4 sZFXyCe8Um3vtMMsd3VgzaAFunoYr64YMQpUO2sTRGmuaa3+KZzun3XEydTB5mB4+TQv yEQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734427; x=1754339227; 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=p6DeVgk8XdY332rGP8e1Y9P9nqTYTkslVRnaqoYpg6g=; b=HiW9qk+v65ZczVi09rBBYdP6SL34zuA0hAkb/587iXI9o5LTg4+skRBUx4Qi4pyndo uaRuq2wyc0peTUABNBsOs4PEz+mSYJli8ARJ4uivuIeHeMOZuw5T3Z8zRZ0RyHaTQsiX 8gGOMaUFhjNvtIB81wlwGsVyfTncqHF3JV9gxIkIeXgMlg7iSBlXS15kRbNC4Wgm7OLN rlbFDt1a6C6EzXvUmsl/OHqW40+lBqt38J6puIcChV6jRkdOoq5WpW2cyBM1wtuo5RpJ INQacjnh2hRt19to+e9A77agUrukvGnla2N9pFSHOPiKHhFw1iqo+yf3JeK8otGkK/09 6MAA== X-Forwarded-Encrypted: i=1; AJvYcCURGd+QPqgtARQxRGfX9cNwsDnPG0DEDT1BSuCXigawopg/gqFFEy06aXcxyx90NoylsLy0ox8M1qa2KKo=@vger.kernel.org X-Gm-Message-State: AOJu0YwhjNUh+22prba/wOP72zp5ZEAv2vX8lbUrP8GpPwYcI6tQROLK jcV8dYWClOyjH5wDfy8vOOmDTUa8jnX7Cv3tfhih4Tg0QrZHPh8fGMlRKDdgNc2jgf+IBIbawyt CXy6JzX1gOvm/E2Sx4Eaq7AbV2oeO0g== X-Google-Smtp-Source: AGHT+IG/t5P9kZcHgHJSbj19h/IqqeeGVkrHfZnsCeG+9fS5N/t5WIwejUn4Q4H8iD8vGQPDyTcO7ribxwwn/Gq1TCg= X-Received: from pfbmb21.prod.google.com ([2002:a05:6a00:7615:b0:748:e276:8454]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4fcf:b0:75f:913e:aaf9 with SMTP id d2e1a72fcca58-763340dd322mr16222303b3a.13.1753734427408; Mon, 28 Jul 2025 13:27:07 -0700 (PDT) Date: Mon, 28 Jul 2025 20:27:00 +0000 In-Reply-To: <20250728202656.559071-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: <20250728202656.559071-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=1562; i=samitolvanen@google.com; h=from:subject; bh=g0N5jPV0NJVbr+uE4KyzNHSLwLqm3nr/w2I6IcG52p0=; b=owGbwMvMwCUWxa662nLh8irG02pJDBntd4XyUpfd6tissKzNWouT5bbUnwNP+Z2msOyK6RTWZ Zyg8Ti7o5SFQYyLQVZMkaXl6+qtu787pb76XCQBM4eVCWQIAxenAExEL5vhf5pEbcJCg/qWRxHl feHRro1vmZger1FKfRe15MTJ/kPCfxgZblquf86lvEA75WqiT3q4b8S5XZu8/Waqiuy3aPS9JJb HAAA= X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250728202656.559071-9-samitolvanen@google.com> Subject: [PATCH bpf-next v3 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 , 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_CLANG 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 --- 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 e9e918cdf31f..7f8cd8637a7b 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -249,6 +249,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) @@ -631,7 +637,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.50.1.552.g942d659e1b-goog From nobody Sun Oct 5 23:57:02 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 D8F8F27FB31 for ; Mon, 28 Jul 2025 20:27:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734431; cv=none; b=fUiGzXCmcAh1ZR+WyWG62psgosItKjGnLiqpnLhbqE0W5JwUeB976eqrsZDJsxRfzwo3ciCkERDRACIu0W2tk04/IAn6fu27YOnRXB+hGA+rw6s6EArdIOOwqAHAAUDWo/Ytbzq1acZo7ywPlc4WukbmXBHqYAr/CHYJoZKbUlU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753734431; c=relaxed/simple; bh=JesGM1gRUcTv/3MB/xSLNTKz18V9F2s0zvsG7n5gUtc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dz315g0dHeiVX0FKLbDjUcN5sDe09Tcl+cjg4ldeLdIJ4/YVVEMnkZ6hzv8kIukiRKwmQ7uTa6qnx3LWyml04pVtAeEfPAl19Ko1Nj2tAqD63rPtS23/maa67c3ejkeWvfAbKW0BaSdjHhnZTZISLdRd73Bz67+xqYL3IElPdok= 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=xlvGpxRG; arc=none smtp.client-ip=209.85.210.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="xlvGpxRG" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-74ea83a6c1bso2119864b3a.0 for ; Mon, 28 Jul 2025 13:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753734429; x=1754339229; 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=/P9OuxEuPdkEj87aBrhfagWzYFVg9xFywuYE1sk8uo0=; b=xlvGpxRGZXS+jlxXUttWmPp+dgQEKl/cBFKPJwPbRlK14P+vt1oG8hMglCaJ/J3Ps9 KLY4/cXv6X5NcehYquUFliN3QM4vTJiq2ZMDR7GVr47TJREZ5P06mCbhhIBN2MaBDAnY MDj7pwSoMCblPVW5bBd8UvVfRK58Vb1n+xHoV62zwp3zkHTIg6Cn7H2AKMF0OPhglhkF vlgyAWxdJYzurKe+Gnam34k8b8wRv9wKeUBRTPAUKepK4NxSnXuArLpVhAqlyavSjKO2 t8sH89XWPzehlagdkO4VB0hsfKnpoJ2PXWdc0eFfpaIbWxBq7ekQxshiYAFPoyVO3ady Q8uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753734429; x=1754339229; 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=/P9OuxEuPdkEj87aBrhfagWzYFVg9xFywuYE1sk8uo0=; b=d+xnj3429/xZ0XPiNfzqhQRotuZWpBdd0iyqYnyyeftjFHTaumOqcjpAQJZIWnsp4N UQvwnFeacq38zUPqo5cvrlPxCQ08e+AfCY+JH8zDIaAP6bQk1MG1Y7ZhNCzLLHsYQjnC IrSClCbXT/tFrp5Q6g0qa/JMAnGMuPh1WAMK126DvRHepdFTUFAHU7Pj829YqBNeTZNe tBWTizwKulXCLvAZvtppnA/PQNGvJ65YJDYTHnY9r+vKwl8Jm/Jc7T4lNfcjgrYJ51QM NmpGRlzwSYW0n/WlU0oBVf6OtXTpa/+eHuITXLrfJqm3HSbm4v3un6tCS+W1lfTrWs7z nnSw== X-Forwarded-Encrypted: i=1; AJvYcCXQ4o3PLPrshpQiACdZSYa8YhokIzOpRD1rI0LpCzoTMAobck1W35EMNWCBtVjz53TtVYHPHABdRH9U4rM=@vger.kernel.org X-Gm-Message-State: AOJu0YyYbMqjq9H4v/JZDYYLTN7EcZZO7fXm0whv5IpA0F2wi8Y86j9h RLnHR4Zod26Y9ffGadUPCjUbtibjU1vhKClKl8ihnso8kBxu3ab9w30it2/d1Hf9xIl1qKPZTWR lFGp8dqqoFp+wBbla1wN9wsOtivP2/A== X-Google-Smtp-Source: AGHT+IEbju/KTqJoDu3swOvm0juyltSfbB5oQy9E98NyEsXpooGy1GcURFGIPbMqA42kwzScDk2+igqG1YSrUrHOrFg= X-Received: from pfgg3.prod.google.com ([2002:a05:6a00:bd83:b0:748:dfd8:3949]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:aa7:8885:0:b0:749:93d:b098 with SMTP id d2e1a72fcca58-76339370d7dmr18845795b3a.22.1753734429174; Mon, 28 Jul 2025 13:27:09 -0700 (PDT) Date: Mon, 28 Jul 2025 20:27:01 +0000 In-Reply-To: <20250728202656.559071-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: <20250728202656.559071-6-samitolvanen@google.com> X-Developer-Key: i=samitolvanen@google.com; a=openpgp; fpr=35CCFB63B283D6D3AEB783944CB5F6848BBC56EE X-Developer-Signature: v=1; a=openpgp-sha256; l=904; i=samitolvanen@google.com; h=from:subject; bh=JesGM1gRUcTv/3MB/xSLNTKz18V9F2s0zvsG7n5gUtc=; b=owGbwMvMwCUWxa662nLh8irG02pJDBntd4Xfb/rYr/f2dvXr4ne7aqdJhf232vjVXkH5pO3mQ +/1biQ3dpSyMIhxMciKKbK0fF29dfd3p9RXn4skYOawMoEMYeDiFICJqKoz/JX9kPjg79mjVdy9 W5/nf5x+51DlpzPm3jGcVrsS7Jw+XCxgZDi0aOKRLxFTE+b2vGc+MalM+Nym9yy7pzguuu5V+7k 3/QQzAA== X-Mailer: git-send-email 2.50.1.552.g942d659e1b-goog Message-ID: <20250728202656.559071-10-samitolvanen@google.com> Subject: [PATCH bpf-next v3 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.552.g942d659e1b-goog