From: Alexei Starovoitov <ast@kernel.org>
Date: Fri, 3 Apr 2026 15:12:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.0-rc6+
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891a05ccba927050cee17eb90c74692fe083ddaf;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.0-rc6+

Cross-merge BPF and other fixes after downstream PR.

Minor conflict in kernel/bpf/verifier.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

891a05ccba927050cee17eb90c74692fe083ddaf
diff --cc kernel/bpf/verifier.c
index a431b7d50e1b8,e3814152b52f8..5434b162c9309
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -20094,8 -19937,18 +20116,13 @@@ static bool regsafe(struct bpf_verifier
  		 * since someone could have accessed through (ptr - k), or
  		 * even done ptr -= k in a register, to get a safe access.
  		 */
- 		if (rold->range > rcur->range)
+ 		if (rold->range < 0 || rcur->range < 0) {
+ 			/* special case for [BEYOND|AT]_PKT_END */
+ 			if (rold->range != rcur->range)
+ 				return false;
+ 		} else if (rold->range > rcur->range) {
  			return false;
+ 		}
 -		/* If the offsets don't match, we can't trust our alignment;
 -		 * nor can we be sure that we won't fall out of range.
 -		 */
 -		if (rold->off != rcur->off)
 -			return false;
  		/* id relations must be preserved */
  		if (!check_ids(rold->id, rcur->id, idmap))
  			return false;