commit 21b4a05c738f32410932ab41aed3bb363116eaaa
author Maciej Żenczykowski <maze@google.com> Tue Sep 03 15:46:48 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Tue Sep 03 16:04:11 2024 -0700
tree 8685c33ad3a4b5aa7d7ae7163a56e4843d02af16
parent de7374d8501e00c85e4b6362cc87bf3cb5bc2b9a

NetBpfLoad: require 64-bit userspace on 6.7+ (sdk=36+)

This duplicates the previous check, but without the exceptions.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id83695689268baacd1112821fa3fd212c3aa0bb6

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 3300e92..2762687 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1523,6 +1523,12 @@
         if (!isTV() && !(isWear() && isArm())) return 1;
     }
 
+    // Note: 6.6 is highest version supported by Android V (sdk=35), so this is for sdk=36+
+    if (isUserspace32bit() && isAtLeastKernelVersion(6, 7, 0)) {
+        ALOGE("64-bit userspace required on 6.7+ kernels.");
+        return 1;
+    }
+
     // Ensure we can determine the Android build type.
     if (!isEng() && !isUser() && !isUserdebug()) {
         ALOGE("Failed to determine the build type: got %s, want 'eng', 'user', or 'userdebug'",