| commit | 0a098f4608ebf3ba50405b1f9cd4cef2a16cf5bc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Nov 22 20:31:29 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 22 20:31:29 2024 +0000 |
| tree | 60c44fb8a9198fc8f9492ee0957957afdbc11995 | |
| parent | 639c27e22381496e04cb62a55f72121d52f0d466 [diff] | |
| parent | 908ca9e9d8fed120f6a58e9f66a58d42ca1f73df [diff] |
Merge "Use unique_fd for usableProgram" into main am: 908ca9e9d8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3372419 Change-Id: Ic4a542720c9ce691f2121f8885d03b4c123b5398 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,