From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 D55182E285C for ; Tue, 11 Aug 2026 04:01:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786420918; cv=none; b=Rv01hMg0hpycfCtSZwP1mGby9qvvpKML7lS3TjQ1SWNsvXkJoG9avZBEvYuFGlqIoUy3I42xLokuQdUGVLhBd5oCIBzyD9HBucz5ol7d5atqCR9Q8JiMaQjLI/BhwORQC4sar+kN9Y5z28yyWETLS7MBWX3jKNTthrc8D9+J9Rg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786420918; c=relaxed/simple; bh=JKB8c704sCV4XMi2SILB65TPadhP+/dZ+kBPOImvi7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zm/yR6AumUL0BKsjYMBZ8vE8eGpEuzVR1B+TbaqlCsmWOdvSmNWlH9BcoL26dFBbQ8Brl6njtlqbCJ6tR/cm6TUv96QhWKFYFXKs77Yz/E/n1OL4lzMBZ5SRxxo0zHH7EmgFNV6cIF41XKAL2Du6QTQhFhAbFCJwn4DAoGNX1EI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=haxzS+Td; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="haxzS+Td" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-ca957432c7fso2541438a12.1 for ; Mon, 10 Aug 2026 21:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786420916; x=1787025716; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TUF/Ie1CAko6dSXUa4KbdnibBpL2SvEJG3sel4Ep/bY=; b=haxzS+Td+tHg7WO2xu21LqUhUxpvz5k45ukPO14aDo/YNqVY+uZ0Z61+qdwpxb4j+p BTgcAtC2+W5jKivlZTATVvI6IfCnMPSYc3XBqA/SgKUj72sRnDU2UbWlyWQQvc86pdKb iAPBSqK1T75HkIqQNnvZv9WTXlo/dr1O6omyjvP7RvnoKzrriorb8DFwUpOS9BcJfRfr saVGL9D2c96s1plnEOggMV3jFx02Out/uP8g1A+uj57oxHdoEZ0Y5u3fZW4mS4FPF8Ap G7JF7CRe1ckvL5kfEPzinSafwk227yBZfszuTwFu/nBX8bH42YkYN6xsXguYQVo1F5Xz JZZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786420916; x=1787025716; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=TUF/Ie1CAko6dSXUa4KbdnibBpL2SvEJG3sel4Ep/bY=; b=HS2XgIbJj79p0SicNv9hKov22vJfyCC1qNemnykNIe2W1ffAMGAUTUFuChHv5EkLyE 8kpH20TE68mH3Z7GULf/Yh0rtVUE0aSFAihduHjPs9SynVWkOr3gSxuJThfWJv6vJthw 6ANUmwdVMTfNmUnuGXgfp106fnpQNrddUR+WanQPRn9ZNh9S5UGtSMcE6cE19so7irF6 CjjUaR+tmkZMg2oirlbd6xuwS8Se7N6EW1B0bil7CVGI4ySw7vanbKI0qowRZtMXXllU urUA7yqrEdWx/IqTIwN/jLE8dNvDdNM+s68+TXCwFdLY7VVDCWgF2TTsWm10jnWQ9ecp KVgA== X-Forwarded-Encrypted: i=1; AHgh+RpJ6WYvSm27Kx2dIsq2VTohBwMwuvhxhxG8m7nxsIP50jC9UDK12zyIa8WndFpNPmRHRrKzoAH+M/ZEhBc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7Z8p1GdAsUnBCRPeAuF/bPvV1eq97WP9i9vup3ktySMtiAc70 +voUweodoOfLXjYG3MXYgQiRekPW+JLP8jszkLzUQ+UvDqNA5r61RJLE X-Gm-Gg: AR+sD13n7P1S7NhPkuBmF8w2iHGa4fCttEWJjusuO0uFKLsIZja2nfZydbTzmTpYbfz 5jPU+yoqgoX6uV+6v7N2G8+npCfhyGZe3vMBXFYf4XGzI3Qf4PQGNnigYuFPWezTUdod9pZpCnh kn/w/+NaP0DSm3/VDn9bBsgJElZUMl/7t9+sYOMS2MaognS5ITzrUurzSVZb7qKiuNHkBceQXUS 9sPq6UeCcMLkxif6zYSWiWYAoONP908S48mgkDWwL7fxpi8Z0p2qJEqhw5ykFJsG2hWTcx/zECz 04ZWRfWjnC9HX/U9S8jFCMw7uqanHTXMA586Hk5k+fhA5GFMdKR34mUW551fjpPCm1cONSK1T1v Ij7kecpF18o9SH0a/KaHHchAVUupb3B81io0OQdRcY8I3omyVczfXIJv8uaiO3D9+tXwgUgV0Be TwN18qFrO+F58F//oyg5NH3nmdOFPfZ4WENjuM2v6xzneagI+cL0Xm6MHXmjGzVhz1XDoiJkKu4 /LKxOCq2FsnpYgY8I/euqLKCYk= X-Received: by 2002:a05:6a00:4f8f:b0:845:3fea:96c with SMTP id d2e1a72fcca58-84fa873633cmr252213b3a.21.1786420916032; Mon, 10 Aug 2026 21:01:56 -0700 (PDT) Received: from patterson.cs.ubc.ca (patterson.cs.ubc.ca. [198.162.52.65]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbed8bb9569sm163683a12.3.2026.08.10.21.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 21:01:55 -0700 (PDT) From: Ning Ding To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Shuah Khan , Ning Ding , Chuyi Zhou , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v2 1/2] bpf: Compare iterator types during state pruning Date: Mon, 10 Aug 2026 20:59:54 -0700 Message-ID: <20260811035955.132989-2-dingning04@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260811035955.132989-1-dingning04@gmail.com> References: <20260811035955.132989-1-dingning04@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit An iterator stack slot can be MEM_RCU or PTR_UNTRUSTED. These states must not be equal, or the verifier can prune an unsafe path. Compare the pointer type for STACK_ITER slots. Fixes: dfab99df147b ("bpf: teach the verifier to enforce css_iter and task_iter in RCU CS") Signed-off-by: Ning Ding Acked-by: Eduard Zingerman --- kernel/bpf/states.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/states.c b/kernel/bpf/states.c index ea2153cf28d0a..4e6aafad33bd2 100644 --- a/kernel/bpf/states.c +++ b/kernel/bpf/states.c @@ -812,7 +812,8 @@ static bool stacksafe(struct bpf_verifier_env *env, struct bpf_func_state *old, * infinite loop check triggering, see * iter_active_depths_differ() */ - if (old_reg->iter.btf != cur_reg->iter.btf || + if (old_reg->type != cur_reg->type || + old_reg->iter.btf != cur_reg->iter.btf || old_reg->iter.btf_id != cur_reg->iter.btf_id || old_reg->iter.state != cur_reg->iter.state || /* ignore {old_reg,cur_reg}->iter.depth, see above */ -- 2.43.0