commit 7f6a42672ddbd8910a63c344c1882a554cef241c
author Maciej Żenczykowski <maze@google.com> Sat Feb 17 00:42:42 2024 +0000
committer Maciej Żenczykowski <maze@google.com> Sat Feb 17 03:47:52 2024 +0000
tree 9379142d25714a6afa3ab2766bb2a4f5bb874530
parent 2e29f6dd4289c61cd7a6c75a1d970b2b892f8993

netbpfload: V+ x86 require 64-bit kernel

For reasoning see:
  https://android-review.googlesource.com/c/platform/system/netd/+/2966803

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

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