commit 9b6a994984891aeb6779886bfecefaecd5b97fb5
author Maciej Żenczykowski <maze@google.com> Tue Sep 03 16:08:35 2024 -0700
committer Maciej Żenczykowski <maze@google.com> Tue Sep 03 16:09:59 2024 -0700
tree dbc0b6f272189c5b9484a1b746d918226717ff81
parent 21b4a05c738f32410932ab41aed3bb363116eaaa

NetBpfLoad: require 64-bit kernel 6.7+

Note that this is a no-op for everything before sdk=36+,
since V/sdk=35 only supports up to 6.6 LTS anyway.

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

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 2762687..495cbab 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1460,6 +1460,12 @@
         if (!isTV()) 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");
+        return 1;
+    }
+
     // Various known ABI layout issues, particularly wrt. bpf and ipsec/xfrm.
     if (isAtLeastV && isKernel32Bit() && isX86()) {
         ALOGE("Android V requires X86 kernel to be 64-bit.");