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

Commit 1a5b5938 authored by Bart Van Assche's avatar Bart Van Assche
Browse files

init: Fix HandleSignalFd() 



There are two bugs in HandleSignalFd():
* If the one_off argument is true and if no data is read from the
  signalfd, 'siginfo' is left uninitialized and used in the switch
  statement in HandleSignalFd().
* The PLOG() statement in the switch statement should be a LOG()
  statement since it does not report a failed system call.

This CL has been tested by changing kDiagnosticTimeout locally from 10s
into 100ms.

Change-Id: I0e488dd95bc13e1befaef770c0748d1d47f6e431
Signed-off-by: default avatarBart Van Assche <bvanassche@google.com>
parent 874448f4

init/init.cpp

+4 −1
Original line number Diff line number Diff line
@@ -747,6 +747,9 @@ static void HandleSignalFd(bool one_off) { 
    do {

        ssize_t bytes_read = TEMP_FAILURE_RETRY(read(signal_fd, &siginfo, sizeof(siginfo)));

        if (bytes_read < 0 && errno == EAGAIN) {

            if (one_off) {

                return;

            }

            auto now = std::chrono::steady_clock::now();

            std::chrono::duration<double> waited = now - started;

            if (waited >= kDiagnosticTimeout) {
@@ -772,7 +775,7 @@ static void HandleSignalFd(bool one_off) { 
            HandleSigtermSignal(siginfo);

            break;

        default:

            PLOG(ERROR) << "signal_fd: received unexpected signal " << siginfo.ssi_signo;

            LOG(ERROR) << "signal_fd: received unexpected signal " << siginfo.ssi_signo;

            break;

    }

}