From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f4.google.com (mail-pj2-f4.google.com [74.125.227.132]) (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 E7F303D411B for ; Sun, 18 Oct 2026 04:22:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.132 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792297325; cv=none; b=kZ9WJshNE6+nm17eE3xrsqBFcnHIn6fieNBRCKaLetsCwtEyjYevLou05X8e/Kw17Rmv9amwQGtLeprGmn0lsp6a8urkLfJfmmd5FOE3TLMO24lnY0OWQUPzOACW8/4AXgM5TtHaWg1P/5fBr95OI0ZYQLzzE9K0frZMlFlQxm4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792297325; c=relaxed/simple; bh=T0D0pjcsyGvxTyK5PT/aORMTl8tn98rPVPonnB4jtB8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jM1DWhtGgDYqBf9y/6vpChyu/TAksRHTVAsJ3RRmzizxj26TZl3wOPN3a+5k+QH3/+Rv69yowSV8Sa75wI1F1/XyuiDuuR1kVUsuIxG1qp2aLccI8jfakEWHCQeE9MRAzbuuoOfFvfCLGx/DwC28GsA+7fJyXvGfz5ou54SulGw= 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=V05+gcCi; arc=none smtp.client-ip=74.125.227.132 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="V05+gcCi" Received: by mail-pj2-f4.google.com with SMTP id d9443c01a7336-2e96b8bfb43so3260825ad.0 for ; Sat, 17 Oct 2026 21:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792297323; x=1792902123; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=U1BjCtlAaE26RncqrvBMm6eqB5Nsd5pySOKKBL8HRGg=; b=V05+gcCicJ8LKyYxDfFRUCCm2P7lmZG1PpzjJ31tPM9oZ0/8ZqFVEbN4eO1NH23WBR 7SNc6Bu58R3alxYIz+z/k8YW+Y36plYhOhoeLLOPmSgQGHAt2H8mxuJawrTIwePxHxAs /0vBf14jPhMs4/mUcokr67qmUUB/zR2nprMOdaw9D4rws4VSGGvDnGYA0B+MEh2xWXLp bAEjJHIdj910tBUT9tuF5otnMIHPe0xl4Y67VQ5mGD7q1l1MagOBOYBnBQua2Q+/V/S4 v4NovjGhvzFaGBVPSdkpyCGVjiKKV6yqNsUIv1c591yRjkwH2yPG3NUqJwmb9jHIVgGA 1KMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792297323; x=1792902123; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=U1BjCtlAaE26RncqrvBMm6eqB5Nsd5pySOKKBL8HRGg=; b=sVbnqJTB8zAvqUy3Ad5VuhDZWB4JxrWfu9FScGXyjuYh+o91kj3ZGIKFkE3u193aki NghNd0DW25/xALJCkbgwOCwfs0uXkhuNWq1/+byk1Y/fg2FOz1R6yetk0p40CFIJjwor yew0nqi592dR5e38KqucyrKc+HYro8wsFr/44pKzinrh3AMgXdj8Q0o3fsrsgu4V9y6O DR1mqfxIayr1TOuQ24M8F1y2ibtc8Mx4A+guLdAji1s8jkDcgtFHRS+eeGX8YFlBhfMo HIf4kLF68A1/Rc9CIoQyXuhBi6A30WXML5MQXMsHP1eBqCYSYlJKDKWyWkKLmKb/pmQ/ H6jA== X-Forwarded-Encrypted: i=1; AKwUvBxx41NRwbpM/nfJxOAVeyzqFy1MyuikABlp3RhJPb6bKe4j0jA8s0UvxqTCHZWlrB6F2Lf59SglZq0D2MiSoC0=@vger.kernel.org X-Gm-Message-State: AFq9FYLtLGmfsbAPnJxWsueP5NI+l1kGI+GweiIs+Kw2XjCEfjvh0l1h TWW7v5vI84wqILZxC/HatJB1GbBH4vXxBJoZ+GdNugJklSZ5Tem1BLFy X-Gm-Gg: AYBFou0RpntLJMShtPSMA8wIqIiGZs8nunaFW2w5vwbws2WOGpb5M0OJ0TyqB/GNio9 yPw3pPuP6kygNOKK1tH4KTwazBkEj9WkLoYFCCYC2o/0l9xaKdKwHUKcRdSXNVfhHP+j2SyuxpE L7/09Ty0yl8GrfLY2UTVIUBr2W4w0FWPMVOCHH97E4mvmkbhQpnFOaFOSP5X+BApelztdj66Vor wf069KyuuC2DVp+qqrIvCWrtKukzx8nH8xdMqNTqSfnjA1RWyQ9CZuz/uN7K7kzuUFDzMHu2Gh7 6DA5zbk8l3ItP7lRp01/c17Ft4YFtElv+F1HV06dH+psjYg8+LFKFw4lRP9VhhoJ0sk+a2bI0a9 Vh5QwIORwxoMg/Nx0Qdj6OBZScKgAfJ08wIFrylgktwmCZINKvjRvE0vMTqdwxAut11WpPlgMxr y0H+HfR6IevXV5doVRTLH1vzJdgOmF/d80YCcyyeC9LOwXcOHXWQm1NtfZ6sqFGAMly5BLxObt X-Received: by 2002:a17:903:124a:b0:2e9:8b24:8dca with SMTP id d9443c01a7336-2e9a6d367aemr36866455ad.54.1792297323127; Sat, 17 Oct 2026 21:22:03 -0700 (PDT) Received: from [127.0.1.1] ([123.109.188.177]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2e97e8758efsm24799195ad.55.2026.10.17.21.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 21:22:02 -0700 (PDT) From: Woojin Ji Date: Sun, 18 Oct 2026 13:21:41 +0900 Subject: [PATCH bpf v2 1/2] bpf: Zero-extend the index in inlined bpf_get_func_arg() Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261018-get-func-arg-v2-1-048848b3eddf@gmail.com> References: <20261018-get-func-arg-v2-0-048848b3eddf@gmail.com> In-Reply-To: <20261018-get-func-arg-v2-0-048848b3eddf@gmail.com> 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 , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Woojin Ji X-Mailer: b4 0.14.2 bpf_get_func_arg() takes a u32 index, but the inlined expansion compared only the low 32 bits of R2 with the argument count and then shifted the full 64-bit register to compute the context address. R2 is ARG_ANYTHING, so nothing guarantees that its upper bits are zero: an index of 1ULL << 32 passes the bounds check as index zero while the load is performed at ctx + (1ULL << 35). Shift the index as a 32-bit value. When the 32-bit bounds check passes, the low 32 bits of R2 are below R0, and R0 is at most 255: the trampoline arm masks the argument count with 0xFF and the raw_tp arm uses the BTF argument count minus one, which the verifier caps at MAX_BPF_FUNC_ARGS. The 3-bit shift therefore cannot overflow and it clears the upper bits of the register. Widening the comparison instead would reject indices whose low 32 bits are valid. The check itself is unchanged, so this cannot change which programs are accepted, only the address that is computed. Fixes: f92c1e183604 ("bpf: Add get_func_[arg|ret|arg_cnt] helpers") Assisted-by: LLM Signed-off-by: Woojin Ji --- kernel/bpf/fixups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/fixups.c b/kernel/bpf/fixups.c index d6f83521fc78e6c6a82d1969662f1eb52f64f4c3..ec62df6811e0b0b9da11405cf189c0f0419a4496 100644 --- a/kernel/bpf/fixups.c +++ b/kernel/bpf/fixups.c @@ -2256,7 +2256,7 @@ int bpf_do_misc_fixups(struct bpf_verifier_env *env) cnt = 2; } insn_buf[cnt++] = BPF_JMP32_REG(BPF_JGE, BPF_REG_2, BPF_REG_0, 6); - insn_buf[cnt++] = BPF_ALU64_IMM(BPF_LSH, BPF_REG_2, 3); + insn_buf[cnt++] = BPF_ALU32_IMM(BPF_LSH, BPF_REG_2, 3); insn_buf[cnt++] = BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1); insn_buf[cnt++] = BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, 0); insn_buf[cnt++] = BPF_STX_MEM(BPF_DW, BPF_REG_3, BPF_REG_0, 0); -- 2.47.3