commit e771525f4fbf58c3948e792de50e8270bfbf94a0
author Maciej Żenczykowski <maze@google.com> Tue Feb 11 10:53:53 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 11 10:53:53 2025 -0800
tree 8e8d294837fda083730983c259a0625844950f02
parent 127715a53dc6ec9629d065a0fa9e15969108a5c8
parent f6c1f7574d3c1b9dc7a293f014e827d28addc28d

Merge "bpf: check _Alignof(u64) == 8 (except i386 where 4)" into main

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 04d7492..1e088a6 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1490,6 +1490,11 @@
         if (!isTV()) return 1;
     }
 
+    if (isKernel32Bit() && isAtLeast25Q2) {
+        ALOGE("Android 25Q2 requires 64 bit kernel.");
+        return 1;
+    }
+
     // 6.6 is highest version supported by Android V, so this is effectively W+ (sdk=36+)
     if (isKernel32Bit() && isAtLeastKernelVersion(6, 7, 0)) {
         ALOGE("Android platform with 32 bit kernel version >= 6.7.0 is unsupported");