commit 502a77e19b64f23ad862eda83f7d8af877900cbb
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 18 23:56:55 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 18 23:56:55 2020 +0000
tree e78c55eb321f3dfed2fab83f893376f5c14cb4e4
parent e78aa72ad48bbe6d9ed97c9bfca9f87b64d62787
parent 7c2a35dcba965f3846683dc50873ae88c91c64b1

Merge "libtimeinstate: open programs read-only" am: c6f093abed am: 49a46bc34b am: 7c2a35dcba

Change-Id: Idb89a4e51b03f1b5a14c100bf9499df11d91925b

libs/cputimeinstate/cputimeinstate.cpp

diff --git a/libs/cputimeinstate/cputimeinstate.cpp b/libs/cputimeinstate/cputimeinstate.cpp
index b6b81bb..fbc485c 100644
--- a/libs/cputimeinstate/cputimeinstate.cpp
+++ b/libs/cputimeinstate/cputimeinstate.cpp
@@ -156,7 +156,7 @@
 static bool attachTracepointProgram(const std::string &eventType, const std::string &eventName) {
     std::string path = StringPrintf(BPF_FS_PATH "prog_time_in_state_tracepoint_%s_%s",
                                     eventType.c_str(), eventName.c_str());
-    int prog_fd = bpf_obj_get(path.c_str());
+    int prog_fd = bpfFdGet(path.c_str(), BPF_F_RDONLY);
     if (prog_fd < 0) return false;
     return bpf_attach_tracepoint(prog_fd, eventType.c_str(), eventName.c_str()) >= 0;
 }