commit 17080ca9da527f662d678c9a2b937e604d6ac15b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 22 00:14:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 22 00:14:37 2022 +0000
tree 66bae9bedd03451334e80e5643d15b638bac7c50
parent 6dc356bd4cac3141c8e6c7bda1c4b3a183e61f95
parent 15f1bf8928a3c136fe7487c9eb70053922e63db5

Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" am: 15f1bf8928

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

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

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index ad20176..d68f407 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.27
+// This is BpfLoader v0.28
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 27u
+#define BPFLOADER_VERSION_MINOR 28u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"
@@ -737,6 +737,8 @@
     }
 
     for (int i = 0; i < (int)mapNames.size(); i++) {
+        if (md[i].zero != 0) abort();
+
         if (BPFLOADER_VERSION < md[i].bpfloader_min_ver) {
             ALOGI("skipping map %s which requires bpfloader min ver 0x%05x", mapNames[i].c_str(),
                   md[i].bpfloader_min_ver);