| commit | fcf1b2bcce9fd9d1997745d35c6ac36ddd2448a9 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Dec 15 11:59:30 2018 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Sat Dec 15 11:59:30 2018 -0800 |
| tree | a1696bdd02216ccc5c6d13ffbc544f3ae2609741 | |
| parent | 0dd82d8da5aa41dd41744fd35a1b94352796fb38 [diff] |
use epoll_create1 epoll_create leaks file descriptors. Use epoll_create1(EPOLL_CLOEXEC) instead. Bug: 120983106 Test: compiles and boots Change-Id: I59cebb997de9d8b99804cc45a962751976d07ce6
diff --git a/libs/binder/tests/binderLibTest.cpp b/libs/binder/tests/binderLibTest.cpp index 73c2eba..2dd86ba 100644 --- a/libs/binder/tests/binderLibTest.cpp +++ b/libs/binder/tests/binderLibTest.cpp
@@ -1295,7 +1295,7 @@ } IPCThreadState::self()->flushCommands(); // flush BC_ENTER_LOOPER - epoll_fd = epoll_create1(0); + epoll_fd = epoll_create1(EPOLL_CLOEXEC); if (epoll_fd == -1) { return 1; }
diff --git a/libs/vr/libbufferhubqueue/include/private/dvr/epoll_file_descriptor.h b/libs/vr/libbufferhubqueue/include/private/dvr/epoll_file_descriptor.h index 6e303a5..2f14f7c 100644 --- a/libs/vr/libbufferhubqueue/include/private/dvr/epoll_file_descriptor.h +++ b/libs/vr/libbufferhubqueue/include/private/dvr/epoll_file_descriptor.h
@@ -28,7 +28,7 @@ return -EALREADY; } - fd_.reset(epoll_create(64)); + fd_.reset(epoll_create1(EPOLL_CLOEXEC)); if (fd_.get() < 0) return -errno;
diff --git a/libs/vr/libvrflinger/epoll_event_dispatcher.cpp b/libs/vr/libvrflinger/epoll_event_dispatcher.cpp index 962c745..1cf5f17 100644 --- a/libs/vr/libvrflinger/epoll_event_dispatcher.cpp +++ b/libs/vr/libvrflinger/epoll_event_dispatcher.cpp
@@ -11,7 +11,7 @@ namespace dvr { EpollEventDispatcher::EpollEventDispatcher() { - epoll_fd_.Reset(epoll_create(64)); + epoll_fd_.Reset(epoll_create1(EPOLL_CLOEXEC)); if (!epoll_fd_) { ALOGE("Failed to create epoll fd: %s", strerror(errno)); return;