From nobody Mon Dec 1 22:37:30 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 0EDA82D77FA for ; Wed, 26 Nov 2025 22:17:32 +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=1764195454; cv=none; b=ExScfnkwYvm+JsLBLD2P/S2djMFS463uRl8yeBXSCfZbMjHPZWmqzdrbltSf0XsD7BXqgAMxvqL66SP5X43u31rWPw5tDJNlsIIIPHp5HJtwhlV3LDlcMm2T8BJ0hML6fKFFE4OuUWab9vhNYhozvYWYgIrfmRKlPXWr5tRH5/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195454; c=relaxed/simple; bh=8bdhp/XEyRN6TXsJtRAeA96+8FmS2vgEzQfyVsGO/oE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=T6C+0REAeh9ktriio64ieYf1lWWXc2qoCYgWAs4CpLlY+3ztf+DUsidAaqjmAW/ez1Y57aoBbjbJlWFVrIJ1u9JuANWxsjBhbYG+wvGzHmziViZ/03+BwJwY9TQDGzD8XSO1ngb2LrOI8exfAnZlaBrXWAuLEeYfJHsTjNHp54w= 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=yhMN14/b; 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="yhMN14/b" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b5edecdf94eso301907a12.2 for ; Wed, 26 Nov 2025 14:17:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764195452; x=1764800252; 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=FMHh1Jv6KIP5NP429fH/fqQBwAKNE3Ze+gaNeawP9DU=; b=yhMN14/b85S16kVa31e4O2v6i5zfiObJVc0vE+vuDVo6bmif99DlQdlNqTcOZ9bO3h 8mXpUYmaoLRPrsesFe5ADx+9ybD5r19eIfylTbA79HTKr/TEja75+ZNcg+eeObVh3tgJ Br19bWOD6+dOCGTMcyLcQUReyMK2D27WTVNXppL0p/YUBROJyV6k6G6/2ghpr27DrQXX 3w+g+tyMZHIF7XzZudV6JxysSgtYNFYvZfSHVs7IWSKn+hozVJAmPlyMJ1+u7sRfPqhs 1De4njpan0HlfYw+9bzB+rNPT7zDq3TaEb0qtPeqxEJruOxgcl1DT5D44aFW5JsCJeSE KFvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764195452; x=1764800252; 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=FMHh1Jv6KIP5NP429fH/fqQBwAKNE3Ze+gaNeawP9DU=; b=leVopt0ji+sm5NBM3skEIoSXDC3Z5hk5X7mgwFQAn3Ew74b2hQe8Et+hifm0Lp3/Mn 8h5RWCcPFiiWbpFOhIO2kurFF23NITCVS5yn6eERc5KefkuT7dk8Su6jHuRVM/UOQcwG 3vWMit+Xtl2v0pRy+3VcEajz/0tWi9f3Qdmi/FJrrPIbB99KGO5VuPCfuCCeM+2bTbXK KItRCU03oQbkZpjctoen8abBdERaZPYQ9fUWLITnkvEEMPAG30UBhNtIWZAVqNA0jnzH Xk3JGDN9qo/QBb8cYwpljWdTWakuAV2Pfxgpo++jAgZ8DDnfYtk5fMBTq5QSWtbY3O/e Tx/w== X-Forwarded-Encrypted: i=1; AJvYcCUk6hBCGULOHgDVMxkPeqSv5dxpUytSvqJ+0VUgiDImH8z1h+oKCcUF2TdiOeqmnhmu12d4o2qvaFz8gt0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1kHSS1l7ri4+rAkwLTlbFBrG8QrfHhZQORNOC4GJOCT+J6R6U uxI1OQoksRCN2dz0J+znOWg2/U6j6R5UUaLLs2d0vRAJUoDKfhzIe8oXGs+lQes0aSFTQmFDB5K 5Jbcu1s0rsK2jMrw5tgO2py35KLwjMg== X-Google-Smtp-Source: AGHT+IEbnKxY9Xeyzuu5MMGLqSobmE20jDIMb11W+9BVqTdpdxRimEZd6sLMSi1ynNQjKwrc5nixFVWYCFDRJlNQr24= X-Received: from dyjh19.prod.google.com ([2002:a05:7300:5613:b0:2a4:603a:d424]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:50ef:b0:2a4:7fb3:7a96 with SMTP id 5a478bee46e88-2a7192d82b0mr11685916eec.36.1764195452142; Wed, 26 Nov 2025 14:17:32 -0800 (PST) Date: Wed, 26 Nov 2025 22:17:26 +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=1790; i=samitolvanen@google.com; h=from:subject; bh=8bdhp/XEyRN6TXsJtRAeA96+8FmS2vgEzQfyVsGO/oE=; b=owGbwMvMwCUWxa662nLh8irG02pJDJnqNaVP9i9t/HFhytmXb8zmFk+40VvNebqHYzfjlp6N4 lXvbZcEdJSyMIhxMciKKbK0fF29dfd3p9RXn4skYOawMoEMYeDiFICJFBox/C9w3vbcTf5P0JNO 48lH03xMLUNZdbcUytw452s/+aviy8+MDL2NyjoGRo2Mjzz3S7XccW18qN95K1km4L1DlCbDSeX PTAA= X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog Message-ID: <20251126221724.897221-7-samitolvanen@google.com> Subject: [PATCH bpf-next v4 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 83c4d9943084..1d024fe7248a 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.487.g5c8c507ade-goog From nobody Mon Dec 1 22:37:30 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 CF220342CB0 for ; Wed, 26 Nov 2025 22:17:34 +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=1764195456; cv=none; b=pqijd2jBzgr/GZ8PIkF92HlzMQ+HSffqyiGEHrD+yJFvszzhOoZ1AqCv5d8zhN6ysr+m9xjrITV9HbrscQ4JOjtY7kLHqfgK4jbWlq+E4xlifp4w9ik81kOh2QNN6WBo4KTS4awMg1n4tT4O1T8vETKdqzHAPliODe/d5JOKsd4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195456; c=relaxed/simple; bh=WQcm0EHsw6PYPITVbaCdvvynX9VHge/XcXBmVFGe0zc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZvbNwooutEA7j6HGZZqcSZBMTDgFYpqulDf20lRRTmN7p0ThiBhXl15lCj6xJNIhxlHMK5ibtmA82XSYtyQ+j2hsnJ34lbDloji8zhEpz0Z+svapL37eBrjO9U2g1k3Roer9rWxdWTQ9jl/Gq5Ps8xSq7tRGt7B/8YySyfj3alA= 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=PqY/6+CA; 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="PqY/6+CA" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b98e6ff908aso677858a12.2 for ; Wed, 26 Nov 2025 14:17:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764195454; x=1764800254; 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=zt/vrs22IFRNV23j1sT0XTLeik6zpTMCFKyG7xgZ91A=; b=PqY/6+CAnpy12IwsGyQKGgcLJytH6cmOKqNp9oSJtcWLknjb4w93p1kwv19YxXFj4c w+CwgbZaBRE3huLJkPluEdMkOAuVm+CUFLMGG9U0ZwJpRpvU+7wC+HelP6q6i/BiTiWa sUre1XTS7JPAyDE5cLhoi/dBoy4W6eN7K2V2Q8jaPx10exbZ3jKhfTGScizo1rOHf1Fy qAsN5L6SLBp+tZhNByOmosj/RLUlvGEb97Sk+VjbyySv0PLpHdPWc5ApRM1flGizMSGT 4r9QkGUhH5JRWhwLvNSCF2Ti956xsmJFnnoCRpSCQsvnaiWzlTsq8/Ng8B3zyx52RPrl tkOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764195454; x=1764800254; 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=zt/vrs22IFRNV23j1sT0XTLeik6zpTMCFKyG7xgZ91A=; b=ebF5eif5cT4e69Pj8xQcYo28cjftBRLt3ADp8v+WACv9IaSjHQZbpAUD+BJWefBCZ8 QXBuNR1XSonCuWP0/kAZpW0OzTRrfsovqQppv2UPjPingS+j7mNv8doPdltL4J+xaBCU A3w5Kj6gwXx0s4wPc/iP7JQ0kDPHC4x1Jd2p11xojE+xGshWKWjSEWHGivs1B0dh1odT hPGcD2/jKD6U+JzJY4YVBzVrJqJCAmJnvb8aT1jEcz+RxsEb6Ng8cknmGn5OvzOrM1Ra pUL5F3V3VlBqWN0yuA1d7KgvJ4MGCEw5Tq8SALV7FdgXpDQRSA/lk1F2nyjZXg8iG8IW H7EQ== X-Forwarded-Encrypted: i=1; AJvYcCV/me13TbFXmaAgg1mSR4tBcWmDU5f9zwWbpimjn4SjfA2cTttb7FAbWxc6IbxV66DuwRYHV1pP7a/PQ1A=@vger.kernel.org X-Gm-Message-State: AOJu0YzZFPqGwlPjTAaGTmvTSyDQUshHYxCUIfKqd9lBmhXg1ANiqwz8 xIez1YQI/ZU/JaXUq4C6xqUO9I17TzliDVyOUtJo5zgh7El+f/p+LxetTnG2m7j+mphqf8Q6FL0 miizHnaj2c8OHYV6obfkEReUwZ6fKHw== X-Google-Smtp-Source: AGHT+IFIz71LhfTwWHL1z2gigA7hdTT4BwNN3sP1QkyaP0YT8yLO1AIMoS4BZJ/uN8VXCBLMXckv46l8r9Qy1fLWBAo= X-Received: from dlf18.prod.google.com ([2002:a05:7022:412:b0:119:c6ec:cc42]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6ba8:b0:11b:9386:7ece with SMTP id a92af1059eb24-11cbba58e14mr5798079c88.43.1764195453875; Wed, 26 Nov 2025 14:17:33 -0800 (PST) Date: Wed, 26 Nov 2025 22:17:27 +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=1442; i=samitolvanen@google.com; h=from:subject; bh=WQcm0EHsw6PYPITVbaCdvvynX9VHge/XcXBmVFGe0zc=; b=owGbwMvMwCUWxa662nLh8irG02pJDJnqNaUG053rjder3zVjlW4vPdJ5pHaVQ9Pt/iLtuP7Jx qn65Uc6SlkYxLgYZMUUWVq+rt66+7tT6qvPRRIwc1iZQIYwcHEKwETU7zEybJns+mHy4+zTJ+U+ OG/aWnFd7Z5i07HzfjyvPNob+T6ZeDEydPQdDLx5/ObLqx/6jrd8Ktfcb88me3iO/qma+TP2s3B GMAIA X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog Message-ID: <20251126221724.897221-8-samitolvanen@google.com> Subject: [PATCH bpf-next v4 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 , 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. 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.52.0.487.g5c8c507ade-goog From nobody Mon Dec 1 22:37:30 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 6E11A27E7F0 for ; Wed, 26 Nov 2025 22:17:36 +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=1764195458; cv=none; b=TVchoWtW1lAGUzckvAS/lmiFg309gXqqJb7lDEGzQ0Zeh5+heaq7ae97V+4VBg9r7pnxT3cCHNSem3IlrwC2oE90SSqQanfgR4PQDiGYvMs9QeSbAFx0EnYF3mL2Oe4hrGWXeNdCQWK2FxfyHWiXdW4NSo1zH2MJ76MWItC0SG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764195458; c=relaxed/simple; bh=ZJPohzGvoQ1v18uU33SR3JA9T9m8SmUDZDW0IUlOvGo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Py7+w/tlboEm53iBul2jSjHLuXOGr5vYLJP6DYKnKdaU6xMs+FTrgzmTJhPJ63S5p7qCWoL1E01ps08z4vVMh2CtzVSfPP0h4pINZ/+hF6GtrDKUBD6Qv/ExyDRwpjOPdY8vHCkXJNC1W0/mHKAiqr2lE/SHCRKQwrM14O6YWhU= 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=z57xFgng; 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="z57xFgng" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7bf15b82042so232443b3a.1 for ; Wed, 26 Nov 2025 14:17:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764195456; x=1764800256; 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=IkopYgjW0ZhNI0/DMyFsBAutmxIPpQBDxr/HiAwk2qY=; b=z57xFgngqfX/56oyqbGs2no5IooBJd38Lx4yXCeIG9x9q3qeWh6GHf2kOXgNBUmqL2 +BG6EoU9wFuYXdZfDYQL8SLnOTdCo0h1WXgOTT2Sqk5w3ERji+aYPBuOeJlq2+DbbsRE J8kHoOkJjMbo+Kr6gyJgtUdYPeEsmXlwe9aPooMYvD/tx8/UVZDBRuDeQkC4X1dBOe5i TefB6HLPLYmCBkC6yU1kOiGCnCOhppe+9lcb75bSLMFLQJLQqBYr07S15GC41xsMR1lt tEJ0ddz9y6Vc+C7TBpB0y01jopYChGwi2n2WLrYQHqrYx/D0tB/KM76jEnn+UTShBJ1T ciDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764195456; x=1764800256; 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=IkopYgjW0ZhNI0/DMyFsBAutmxIPpQBDxr/HiAwk2qY=; b=M5y+ZwzVda4kl14gKwDHfyVeR4uFxrXBmDVD4xEpcSWooX1BDQ9K+gTbFlDKgZbwxw XiJ0gWo8wx8rIFB7pWLRdm0tWCx2HLA3IxqssQXRVd7i4urR+bZakWjabwu4p/W8dyN/ 5SEl3uDwQFJENbTSOWsi3f5S3OMPpfascuhZm1qWlngnk0cce6GRawH/ED3+1fvHp6OF 5QmTiZRNmpQTX0NDiLSi5IdpCY6GXGGyuhlovNV0e1Qbd1x/GrxRd+DUXKwVGgfbYezr qBuHzTInd/h7hhAIC9MpcR4u+sLt+lkGx7mkoHbsUqkkbg/SsN43EVeLq4sgYU43aW9K hS/Q== X-Forwarded-Encrypted: i=1; AJvYcCWBC80LoONndt4OeXNfRJ3xsdi+p6PI1I9K5CHpvxFZ9eFf/SR7Aspffem7yaKV61zYVwoURuvUxuyxORc=@vger.kernel.org X-Gm-Message-State: AOJu0YzyiCQzlNEg8B2czq7DQ7uq6bShNJOmvkLlmLogjzZ6TT5EqXuB D7q1FZ4ohyrBeAZsfPoJ/WAYgQHxDoQ8eZCy66MAzaW8LDiVoCSWT3qBLikUqV0v/2t+zi//vYR 1mO1T1J2+3KWwr/wiTMw3z+4K+FOkAw== X-Google-Smtp-Source: AGHT+IFZn7eSu6wdNc8Ge7MB3eF2N+Mv0sgT8A6mAc5qcFvErPDUFWdieE2xKOS8McVUJNg4kQwiENNTWfkv312xEyA= X-Received: from dlaf9.prod.google.com ([2002:a05:701b:2409:b0:11a:1004:5049]) (user=samitolvanen job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:4424:b0:11b:9386:a3cc with SMTP id a92af1059eb24-11c9d872af1mr12462901c88.45.1764195455574; Wed, 26 Nov 2025 14:17:35 -0800 (PST) Date: Wed, 26 Nov 2025 22:17:28 +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=1607; i=samitolvanen@google.com; h=from:subject; bh=ZJPohzGvoQ1v18uU33SR3JA9T9m8SmUDZDW0IUlOvGo=; b=owGbwMvMwCUWxa662nLh8irG02pJDJnqNWU71RW4oh/Ju1zeLfbB/VPtwyxvLmYVXWfDlVPmy 9yPYI7tKGVhEONikBVTZGn5unrr7u9Oqa8+F0nAzGFlAhnCwMUpABPxdGb4nz5nXuxhvW/OP4Mm v8qpmHM80L+527V12jvnb/Nkvjr6yjEyXIwR0Lp543yfWF1TzhxDjn2LU063Fuxl63vqd2jF81J FXgA= X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog Message-ID: <20251126221724.897221-9-samitolvanen@google.com> Subject: [PATCH bpf-next v4 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 , 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. 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 ed0a4721d8fd..bf8f6b2591c1 100644 --- a/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c +++ b/tools/testing/selftests/bpf/test_kmods/bpf_testmod.c @@ -285,6 +285,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) @@ -707,7 +713,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.52.0.487.g5c8c507ade-goog From nobody Mon Dec 1 22:37:30 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