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

Commit 1d4e86c4 authored by Amir Goldstein's avatar Amir Goldstein
Browse files

ueventd: fix a busy loop while reading uevents 

Under certain conditions, poll() may raise the POLLERR
flag along with POLLIN, in which case the check for
(ufd.revents == POLLIN) results in an endless busy loop.

The following fix was applied to
hardware/libhardware_legacy/uevent/uevent.c
to fix a similar bug:

  commit 3aabb260ceef10377c31c9e45fb239247f5cfeba
  Author: Mathias Agopian <mathias@google.com>
  Date:   Mon Oct 1 14:53:18 2012 -0700

    fix a typo in uevent_next_eventi

    Bug: 7114973
    Change-Id: I15a4c714b59aeb1d02db00517d70b5f0e5ab22c2

Applying the same fix for two more poll loops in init
and ueventd.

Change-Id: I50693f6d3c904992ac4b8a9a14a83c7106e6b9e0
parent 3fa14a53

init/init.c

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ int main(int argc, char **argv) 
            continue;



        for (i = 0; i < fd_count; i++) {

            if (ufds[i].revents == POLLIN) {

            if (ufds[i].revents & POLLIN) {

                if (ufds[i].fd == get_property_set_fd())

                    handle_property_set_fd();

                else if (ufds[i].fd == get_keychord_fd())

init/ueventd.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ int ueventd_main(int argc, char **argv) 
        nr = poll(&ufd, 1, -1);

        if (nr <= 0)

            continue;

        if (ufd.revents == POLLIN)

        if (ufd.revents & POLLIN)

               handle_device_fd();

    }

}