commit 4498ab9a0eb6ba0ab9ac5d6c63f9f27e3c57a4a8
author Chih-hung Hsieh <chh@google.com> Fri Jan 13 18:59:45 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 13 18:59:45 2023 +0000
tree 18a83ff3edcfdaff7081bb542a8bb0370fe60e60
parent b41a3cfd4e2a2f61efde37cef69b6d6d4fa24899
parent ef3f44b639b786d857462a7bf8ca939447a3ceb4

Merge "Disable tidy DeprecatedOrUnsafeBufferHandling check"

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 4a2684d..faad8db 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.32
+// This is BpfLoader v0.33
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 32u
+#define BPFLOADER_VERSION_MINOR 33u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "BpfSyscallWrappers.h"
@@ -1038,6 +1038,7 @@
             (cs[i].prog_def->ignore_on_userdebug && isUserdebug())) {
             ALOGD("cs[%d].name:%s is ignored on %s builds", i, name.c_str(),
                   getBuildType().c_str());
+            continue;
         }
 
         if (unrecognized(pin_subdir)) return -ENOTDIR;

progs/bpfRingbufProg.c

diff --git a/progs/bpfRingbufProg.c b/progs/bpfRingbufProg.c
index 99b8345..cbf9104 100644
--- a/progs/bpfRingbufProg.c
+++ b/progs/bpfRingbufProg.c
@@ -21,7 +21,8 @@
 #define TEST_RINGBUF_MAGIC_NUM 12345
 
 // This ring buffer is for testing purposes only.
-DEFINE_BPF_RINGBUF_EXT(test_ringbuf, __u64, 4096, AID_ROOT, AID_ROOT, 0660, "", "", false);
+DEFINE_BPF_RINGBUF_EXT(test_ringbuf, __u64, 4096, AID_ROOT, AID_ROOT, 0660, "", "", false,
+                       BPFLOADER_MIN_VER, BPFLOADER_MAX_VER, false, false, false);
 
 // This program is for test purposes only - it should never be attached to a
 // socket, only executed manually with BPF_PROG_RUN.