commit dc9df5683b2b1f2ac56fefe2ac012249fbab8132
author Maciej Żenczykowski <maze@google.com> Wed Sep 04 04:04:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 04 04:04:33 2024 +0000
tree df6fac351626f742594c57a28ec5e30dae2c92ec
parent c37ffda6e51e6c19f39e47f4e9e014c65b4c2073
parent 539fcfd717baf4b51eff6ca4ef8416ab9800a07a

NetBpfLoad: require 64-bit userspace on 6.7+ (sdk=36+) am: 21b4a05c73 am: 539fcfd717

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3253903

Change-Id: I43df3a81e06df714cc824407e714041cf44d810c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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'",