commit a21256dcf1f429af75367f1e85b226d571260019
author Maciej Żenczykowski <maze@google.com> Fri Jul 02 00:40:55 2021 -0700
committer Maciej Żenczykowski <maze@google.com> Fri Jul 02 01:17:13 2021 -0700
tree bf458d7db606d0f1b848afffe943ce776e5832c5
parent 9217eee3df60a1ff07e020e5176867ff84a54bfe

bpfloader - minor fixups asked for by reviewer

As requested by Bernie on previous commit.

Bug: 190519702
Test: atest, TreeHugger - existing bpf programs load
  examination of bpfloader logs
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4f5181f371d31dcf52768217ffd2b1b5b772103d

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index c10988d..b1af34f 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -514,14 +514,14 @@
         if (BPFLOADER_VERSION < md[i].bpfloader_min_ver) {
             ALOGI("skipping map %s which requires bpfloader min ver 0x%05x\n", mapNames[i].c_str(),
                   md[i].bpfloader_min_ver);
-            mapFds.push_back(std::move(fd));  // -1
+            mapFds.push_back(unique_fd());
             continue;
         }
 
         if (BPFLOADER_VERSION >= md[i].bpfloader_max_ver) {
             ALOGI("skipping map %s which requires bpfloader max ver 0x%05x\n", mapNames[i].c_str(),
                   md[i].bpfloader_max_ver);
-            mapFds.push_back(std::move(fd));  // -1
+            mapFds.push_back(unique_fd());
             continue;
         }