Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c038f2a authored by Nick Kralevich's avatar Nick Kralevich
Browse files

healthd_common.cpp: use epoll_create1 

epoll_create leaks file descriptors. Use epoll_create1(EPOLL_CLOEXEC)
instead.

Bug: 120983106
Test: compiles and boots
Change-Id: I50aad9f1c0633add2b44fb22be73dd292a366f39
parent ba400a29

health/2.0/default/healthd_common.cpp

+2 −4
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ static int epollfd; 


#define POWER_SUPPLY_SUBSYSTEM "power_supply"



// epoll_create() parameter is actually unused

#define MAX_EPOLL_EVENTS 40

static int uevent_fd;

static int wakealarm_fd;
@@ -240,9 +238,9 @@ static void healthd_mainloop(void) { 
}



static int healthd_init() {

    epollfd = epoll_create(MAX_EPOLL_EVENTS);

    epollfd = epoll_create1(EPOLL_CLOEXEC);

    if (epollfd == -1) {

        KLOG_ERROR(LOG_TAG, "epoll_create failed; errno=%d\n", errno);

        KLOG_ERROR(LOG_TAG, "epoll_create1 failed; errno=%d\n", errno);

        return -1;

    }