From cb555726759433afbcf99508e701d953bb54cc6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Thu, 1 May 2025 06:12:00 -0700
Subject: [PATCH] NetBpfLoad: relax version checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test: TreeHugger
Flag: EXEMPT mainline
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie4ac3608d3f9599ffca40b0b2073f21efed7b17c
---
 bpf/loader/NetBpfLoad.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 5c420df0ba..4a79a0fc1a 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1826,9 +1826,12 @@ static int doLoad(char** argv, char * const envp[]) {
         int v = fscanf(f, "# %d %d %d %d %d #", &y, &q, &a, &b, &c);
         ALOGI("detected %d of 5: %dQ%d api:%d.%d.%d", v, y, q, a, b, c);
         fclose(f);
-        if (v != 5 || y != 2025 || a != 36 || b) return 1;
-        if (q < 2 || q > 3) return 1;
-        if (c < 0 || c > 1) return 1;
+        if (v != 5) return 1;
+        if (y < 2025 || y > 2099) return 1;
+        if (q < 1 || q > 4) return 1;
+        if (a < 36) return 1;
+        if (b < 0 || b > 4) return 1;
+        if (c < 0) return 1;
     }
 
     // Ensure we can determine the Android build type.