commit 27552207cfc695337f92eccef2db08a0d3b9024d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 13 17:25:26 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 17:25:26 2025 -0800
tree 554b40651a203c24272cca9b45596a4466899266
parent ab5d89a26f8300d7d1a229365d8a25adaf8d6322
parent a003ace53200d6a0e5188cec8c20e71a47c01532

Merge "NetBpfLoad: don't call bpfGetFdMapId in kernels < 4.14" into main

bpf/loader/NetBpfLoad.cpp

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 5554104..c67be66 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -859,11 +859,13 @@
             }
         }
 
-        int mapId = bpfGetFdMapId(fd);
-        if (mapId == -1) {
-            if (isAtLeastKernelVersion(4, 14, 0))
-                ALOGE("bpfGetFdMapId failed, ret: %d [%d]", mapId, errno);
-        } else {
+        if (isAtLeastKernelVersion(4, 14, 0)) {
+            int mapId = bpfGetFdMapId(fd);
+            if (mapId == -1) {
+                const int err = errno;
+                ALOGE("bpfGetFdMapId failed, errno: %d", err);
+                return -err;
+            }
             ALOGI("map %s id %d", mapPinLoc.c_str(), mapId);
         }