commit e5f58a6af22e948942a4a3dd10f2c5f2f2f714a1
author Maciej Żenczykowski <maze@google.com> Wed Sep 04 04:04:37 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 04 04:04:37 2024 +0000
tree cb79ed85aab2cbcf84a63771e5116108f8319617
parent dc9df5683b2b1f2ac56fefe2ac012249fbab8132
parent bb8fca317e8dabcff359801cf5a71c5b74cec025

NetBpfLoad: require 64-bit kernel 6.7+ am: 9b6a994984 am: bb8fca317e

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

Change-Id: I621e031d469819efde15ce28dc764e3f9773b9c9
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 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.");