From nobody Sun Feb 8 04:11:31 2026 Received: from out-188.mta0.migadu.com (out-188.mta0.migadu.com [91.218.175.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F218C296BAA for ; Mon, 3 Nov 2025 06:32:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762151548; cv=none; b=FSzrldkWYx795jV4yoSn4Dz9Fau3B6DMnvFtd+9ZIIrHubC6nv5QIwi2+2I3PctEc/MIPOrdALld/jH4cBqUBN/R291TE6MaNDSS6OfFK9oIlHSEu2jwupLj0Hcbq0vzxgd/lYdF6oI+ZahrjYPzSRG18KHn8mBKfAq0GlDwCXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762151548; c=relaxed/simple; bh=5dlvQW3j7tlnksTc3f5p9ccCcZfH17m5aZYZ739FeZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nv27NqGd86BmOprQa/yxgwUQVY99YIZ8yoEyzfQOIZwQ8QOlACdgMsrJ5vrpOQaZHKrvWI17OTrwD7IGVE4KQYHZJKgtsoOEZAvoM9sV5ZhCKFQX5WXiY5tUP6eum+aTMKnZFgQ3TEwKwdZ4QA4IOOaIq1aDKMrqb4h0M11pas0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=NRgkAqeN; arc=none smtp.client-ip=91.218.175.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="NRgkAqeN" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1762151544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2vFbOtEevYdcE9ma7oHwHbSng62XKE11/lNPHm5Qupo=; b=NRgkAqeNQr5IFlJm9OkTHolDNS+eeyQTDwFdBFYgOZYi00U8LJhyl0SAkSQo0ttnm64RI0 L8zrP3f/zkMc6Koqegkg48HO3eWwC4ZHyaAfo4xjPTIksQNg+wpZzESuCjDhxJ8BdIfr7s fO8setXvIGke2KoW5XZTMqyo6lLiT/Q= From: KaFai Wan To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, paul.chaignon@gmail.com, m.shachnai@gmail.com, kafai.wan@linux.dev, harishankar.vishwanathan@gmail.com, colin.i.king@gmail.com, luis.gerhorst@fau.de, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: Kaiyan Mei , Yinhao Hu Subject: [PATCH bpf-next v4 1/2] bpf: Skip bounds adjustment for conditional jumps on same scalar register Date: Mon, 3 Nov 2025 14:31:07 +0800 Message-ID: <20251103063108.1111764-2-kafai.wan@linux.dev> In-Reply-To: <20251103063108.1111764-1-kafai.wan@linux.dev> References: <20251103063108.1111764-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" When conditional jumps are performed on the same scalar register (e.g., r0 <=3D r0, r0 > r0, r0 < r0), the BPF verifier incorrectly attempts to adjust the register's min/max bounds. This leads to invalid range bounds and triggers a BUG warning. The problematic BPF program: 0: call bpf_get_prandom_u32 1: w8 =3D 0x80000000 2: r0 &=3D r8 3: if r0 > r0 goto The instruction 3 triggers kernel warning: 3: if r0 > r0 goto true_reg1: range bounds violation u64=3D[0x1, 0x0] s64=3D[0x1, 0x0] u32= =3D[0x1, 0x0] s32=3D[0x1, 0x0] var_off=3D(0x0, 0x0) true_reg2: const tnum out of sync with range bounds u64=3D[0x0, 0xffffff= ffffffffff] s64=3D[0x8000000000000000, 0x7fffffffffffffff] var_off=3D(0x0, = 0x0) Comparing a register with itself should not change its bounds and for most comparison operations, comparing a register with itself has a known result (e.g., r0 =3D=3D r0 is always true, r0 < r0 is always false). Fix this by: 1. Enhance is_scalar_branch_taken() to properly handle branch direction computation for same register comparisons across all BPF jump operations 2. Adds early return in reg_set_min_max() to avoid bounds adjustment for unknown branch directions (e.g., BPF_JSET) on the same register The fix ensures that unnecessary bounds adjustments are skipped, preventing the verifier bug while maintaining correct branch direction analysis. Reported-by: Kaiyan Mei Reported-by: Yinhao Hu Closes: https://lore.kernel.org/all/1881f0f5.300df.199f2576a01.Coremail.kai= yanm@hust.edu.cn/ Signed-off-by: KaFai Wan Acked-by: Eduard Zingerman --- kernel/bpf/verifier.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 542e23fb19c7..e4928846e763 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -15993,6 +15993,30 @@ static int is_scalar_branch_taken(struct bpf_reg_s= tate *reg1, struct bpf_reg_sta s64 smin2 =3D is_jmp32 ? (s64)reg2->s32_min_value : reg2->smin_value; s64 smax2 =3D is_jmp32 ? (s64)reg2->s32_max_value : reg2->smax_value; =20 + if (reg1 =3D=3D reg2) { + switch (opcode) { + case BPF_JGE: + case BPF_JLE: + case BPF_JSGE: + case BPF_JSLE: + case BPF_JEQ: + return 1; + case BPF_JGT: + case BPF_JLT: + case BPF_JSGT: + case BPF_JSLT: + case BPF_JNE: + return 0; + case BPF_JSET: + if (tnum_is_const(t1)) + return t1.value !=3D 0; + else + return (smin1 <=3D 0 && smax1 >=3D 0) ? -1 : 1; + default: + return -1; + } + } + switch (opcode) { case BPF_JEQ: /* constants, umin/umax and smin/smax checks would be @@ -16439,6 +16463,13 @@ static int reg_set_min_max(struct bpf_verifier_env= *env, if (false_reg1->type !=3D SCALAR_VALUE || false_reg2->type !=3D SCALAR_VA= LUE) return 0; =20 + /* We compute branch direction for same SCALAR_VALUE registers in + * is_scalar_branch_taken(). For unknown branch directions (e.g., BPF_JSE= T) + * on the same registers, we don't need to adjust the min/max values. + */ + if (false_reg1 =3D=3D false_reg2) + return 0; + /* fallthrough (FALSE) branch */ regs_refine_cond_op(false_reg1, false_reg2, rev_opcode(opcode), is_jmp32); reg_bounds_sync(false_reg1); --=20 2.43.0 From nobody Sun Feb 8 04:11:31 2026 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 057DE286D56 for ; Mon, 3 Nov 2025 06:32:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762151557; cv=none; b=vFmBKX7usbYXrMXNZwsJqyanBU0KCSkltt7wSE5VN/oIDFpNxvWb/irxwFOoBb8T++zUz2BaLoOfAOANHoDWmhfY4qErexG36vPS1d7fGfARHr89SLaBk4nDZdicQ8+72aF/XeUASiDr+2aW49T0oxySVGugWkcwwSVaLJOarFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762151557; c=relaxed/simple; bh=kbe8hMT2OvfiqAmCP4GWUa8XfLFY+MoXA/QxrTvkDww=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ljxSVUXFa2R3G41HO0r5WUI9OVFuLlrTrDD/QGUpGe3FUJKShBxdQmUVEm6XfPZ4lvjW9u1VH7KISOgJ7xvtLDNRy2kDV7iR37RWxR6uf0OwufdhSio2BWRSxkNTOXmRkIEwDx8QKHyJPMvzIs7oNJWB+dNZEYsLhsD4UtN68Uc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=BFOkXztw; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="BFOkXztw" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1762151553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9Co4HTS5uOZjTPA1XBfD/RtU0DY8DXK6Y5uls97p0Vw=; b=BFOkXztwNIL5K8mOH+vAFRaD0ZZkLd1UA9FuPUUuW5dS0hRu5IsyrUUg3PqdK/0YoXhElP cLXB95uuCrazQ9v7FRnqwBUjKZn9g75ncFFabEM/tm/9czjc/T0aXhGdEuf5FFS8OLw7we QpsPF7CfUSYZPdMFHwEmLkUDuKJF8Ec= From: KaFai Wan To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, paul.chaignon@gmail.com, m.shachnai@gmail.com, kafai.wan@linux.dev, harishankar.vishwanathan@gmail.com, colin.i.king@gmail.com, luis.gerhorst@fau.de, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf-next v4 2/2] selftests/bpf: Add test for conditional jumps on same scalar register Date: Mon, 3 Nov 2025 14:31:08 +0800 Message-ID: <20251103063108.1111764-3-kafai.wan@linux.dev> In-Reply-To: <20251103063108.1111764-1-kafai.wan@linux.dev> References: <20251103063108.1111764-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Add test cases to verify the correctness of the BPF verifier's branch analy= sis when conditional jumps are performed on the same scalar register. And make = sure that JGT does not trigger verifier BUG. Signed-off-by: KaFai Wan Acked-by: Eduard Zingerman --- .../selftests/bpf/progs/verifier_bounds.c | 154 ++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tools/testing/selftests/bpf/progs/verifier_bounds.c b/tools/te= sting/selftests/bpf/progs/verifier_bounds.c index 0a72e0228ea9..e975dc285db6 100644 --- a/tools/testing/selftests/bpf/progs/verifier_bounds.c +++ b/tools/testing/selftests/bpf/progs/verifier_bounds.c @@ -1709,4 +1709,158 @@ __naked void jeq_disagreeing_tnums(void *ctx) : __clobber_all); } =20 +SEC("socket") +__description("conditional jump on same register, branch taken") +__not_msg("20: (b7) r0 =3D 1 {{.*}} R0=3D1") +__success __log_level(2) +__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS) +__naked void condition_jump_on_same_register(void *ctx) +{ + asm volatile(" \ + call %[bpf_get_prandom_u32]; \ + w8 =3D 0x80000000; \ + r0 &=3D r8; \ + if r0 =3D=3D r0 goto +1; \ + goto l1_%=3D; \ + if r0 >=3D r0 goto +1; \ + goto l1_%=3D; \ + if r0 s>=3D r0 goto +1; \ + goto l1_%=3D; \ + if r0 <=3D r0 goto +1; \ + goto l1_%=3D; \ + if r0 s<=3D r0 goto +1; \ + goto l1_%=3D; \ + if r0 !=3D r0 goto l1_%=3D; \ + if r0 > r0 goto l1_%=3D; \ + if r0 s> r0 goto l1_%=3D; \ + if r0 < r0 goto l1_%=3D; \ + if r0 s< r0 goto l1_%=3D; \ +l0_%=3D: r0 =3D 0; \ + exit; \ +l1_%=3D: r0 =3D 1; \ + exit; \ +" : + : __imm(bpf_get_prandom_u32) + : __clobber_all); +} + +SEC("socket") +__description("jset on same register, constant value branch taken") +__not_msg("7: (b7) r0 =3D 1 {{.*}} R0=3D1") +__success __log_level(2) +__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS) +__naked void jset_on_same_register_1(void *ctx) +{ + asm volatile(" \ + r0 =3D 0; \ + if r0 & r0 goto l1_%=3D; \ + r0 =3D 1; \ + if r0 & r0 goto +1; \ + goto l1_%=3D; \ +l0_%=3D: r0 =3D 0; \ + exit; \ +l1_%=3D: r0 =3D 1; \ + exit; \ +" : + : __imm(bpf_get_prandom_u32) + : __clobber_all); +} + +SEC("socket") +__description("jset on same register, scalar value branch taken") +__not_msg("12: (b7) r0 =3D 1 {{.*}} R0=3D1") +__success __log_level(2) +__retval(0) __flag(BPF_F_TEST_REG_INVARIANTS) +__naked void jset_on_same_register_2(void *ctx) +{ + asm volatile(" \ + /* range [1;2] */ \ + call %[bpf_get_prandom_u32]; \ + r0 &=3D 0x1; \ + r0 +=3D 1; \ + if r0 & r0 goto +1; \ + goto l1_%=3D; \ + /* range [-2;-1] */ \ + call %[bpf_get_prandom_u32]; \ + r0 &=3D 0x1; \ + r0 -=3D 2; \ + if r0 & r0 goto +1; \ + goto l1_%=3D; \ +l0_%=3D: r0 =3D 0; \ + exit; \ +l1_%=3D: r0 =3D 1; \ + exit; \ +" : + : __imm(bpf_get_prandom_u32) + : __clobber_all); +} + +SEC("socket") +__description("jset on same register, scalar value unknown branch 1") +__msg("3: (b7) r0 =3D 0 {{.*}} R0=3D0") +__msg("5: (b7) r0 =3D 1 {{.*}} R0=3D1") +__success __log_level(2) +__flag(BPF_F_TEST_REG_INVARIANTS) +__naked void jset_on_same_register_3(void *ctx) +{ + asm volatile(" \ + /* range [0;1] */ \ + call %[bpf_get_prandom_u32]; \ + r0 &=3D 0x1; \ + if r0 & r0 goto l1_%=3D; \ +l0_%=3D: r0 =3D 0; \ + exit; \ +l1_%=3D: r0 =3D 1; \ + exit; \ +" : + : __imm(bpf_get_prandom_u32) + : __clobber_all); +} + +SEC("socket") +__description("jset on same register, scalar value unknown branch 2") +__msg("4: (b7) r0 =3D 0 {{.*}} R0=3D0") +__msg("6: (b7) r0 =3D 1 {{.*}} R0=3D1") +__success __log_level(2) +__flag(BPF_F_TEST_REG_INVARIANTS) +__naked void jset_on_same_register_4(void *ctx) +{ + asm volatile(" \ + /* range [-1;0] */ \ + call %[bpf_get_prandom_u32]; \ + r0 &=3D 0x1; \ + r0 -=3D 1; \ + if r0 & r0 goto l1_%=3D; \ +l0_%=3D: r0 =3D 0; \ + exit; \ +l1_%=3D: r0 =3D 1; \ + exit; \ +" : + : __imm(bpf_get_prandom_u32) + : __clobber_all); +} + +SEC("socket") +__description("jset on same register, scalar value unknown branch 3") +__msg("4: (b7) r0 =3D 0 {{.*}} R0=3D0") +__msg("6: (b7) r0 =3D 1 {{.*}} R0=3D1") +__success __log_level(2) +__flag(BPF_F_TEST_REG_INVARIANTS) +__naked void jset_on_same_register_5(void *ctx) +{ + asm volatile(" \ + /* range [-1;-1] */ \ + call %[bpf_get_prandom_u32]; \ + r0 &=3D 0x2; \ + r0 -=3D 1; \ + if r0 & r0 goto l1_%=3D; \ +l0_%=3D: r0 =3D 0; \ + exit; \ +l1_%=3D: r0 =3D 1; \ + exit; \ +" : + : __imm(bpf_get_prandom_u32) + : __clobber_all); +} + char _license[] SEC("license") =3D "GPL"; --=20 2.43.0