| commit | 2aff27df6661b32b72cbddf4968f6644ca9e0104 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 22 21:08:42 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 21:08:42 2024 +0000 |
| tree | 631eaffee19bb449abfb4b693abf5e936586b667 | |
| parent | b7d175ca6ff9d1b24304b26ea5de7996842e594f [diff] | |
| parent | 0a098f4608ebf3ba50405b1f9cd4cef2a16cf5bc [diff] |
Merge "Use unique_fd for usableProgram" into main am: 908ca9e9d8 am: 0a098f4608 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3372419 Change-Id: Ib92cd44c947bc7efa6167059eeb04085ee8c6c0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bpf/syscall_wrappers/include/BpfSyscallWrappers.h b/bpf/syscall_wrappers/include/BpfSyscallWrappers.h index 3c4bc6e..a31445a 100644 --- a/bpf/syscall_wrappers/include/BpfSyscallWrappers.h +++ b/bpf/syscall_wrappers/include/BpfSyscallWrappers.h
@@ -28,6 +28,7 @@ namespace bpf { using ::android::base::borrowed_fd; +using ::android::base::unique_fd; inline uint64_t ptr_to_u64(const void * const x) { return (uint64_t)(uintptr_t)x; @@ -182,10 +183,8 @@ } inline bool usableProgram(const char* pathname) { - int fd = retrieveProgram(pathname); - bool ok = (fd >= 0); - if (ok) close(fd); - return ok; + unique_fd fd(retrieveProgram(pathname)); + return fd.ok(); } inline int attachProgram(bpf_attach_type type, const borrowed_fd& prog_fd,