commit d0451c7fccefa11b84cd7e9a5d8caf9c6b902f15
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 13 04:43:01 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 13 04:43:01 2023 +0000
tree cf017307a3813f1d03f588b00c63bcdd76473103
parent d1b51479dc121ab5c50d14648f7250c914f434ff
parent e8e0a7fbe7e402a5af8426f071e2bbc7eab7e5e5

Merge "bpfloader: Android V requires kernel 4.19+" into main am: 61b8ba3611 am: fd80e33468 am: e8e0a7fbe7

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2749573

Change-Id: I86e2dcfccbfb803825c7256ffad9360fc89cbb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index fe51ed5..e1dbd06 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -251,6 +251,11 @@
     (void)argc;
     android::base::InitLogging(argv, &android::base::KernelLogger);
 
+    if (!android::bpf::isAtLeastKernelVersion(4, 19, 0)) {
+        ALOGE("Android V requires kernel 4.19.");
+        return 1;
+    }
+
     // Ensure we can determine the Android build type.
     if (!android::bpf::isEng() && !android::bpf::isUser() && !android::bpf::isUserdebug()) {
         ALOGE("Failed to determine the build type: got %s, want 'eng', 'user', or 'userdebug'",