commit e7ceb1dc291575e66c8456a66e25296400686c0e
author Maciej Żenczykowski <maze@google.com> Sat Feb 17 04:47:07 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 17 04:47:07 2024 +0000
tree 0ecadd6f310cdf62fc0fe001c7a46c528dca4bcc
parent 60a657f4bf8a62a6dba9929c10ba9c703c38ad2f
parent 7f6a42672ddbd8910a63c344c1882a554cef241c

Merge "netbpfload: V+ x86 require 64-bit kernel" into main

netbpfload/NetBpfLoad.cpp

diff --git a/netbpfload/NetBpfLoad.cpp b/netbpfload/NetBpfLoad.cpp
index 2d8867e..2bfaee4 100644
--- a/netbpfload/NetBpfLoad.cpp
+++ b/netbpfload/NetBpfLoad.cpp
@@ -301,6 +301,11 @@
         return 1;
     }
 
+    if (isAtLeastV && android::bpf::isX86() && !android::bpf::isKernel64Bit()) {
+        ALOGE("Android V requires X86 kernel to be 64-bit.");
+        return 1;
+    }
+
     if (android::bpf::isUserspace32bit() && android::bpf::isAtLeastKernelVersion(6, 2, 0)) {
         /* Android 14/U should only launch on 64-bit kernels
          *   T launches on 5.10/5.15