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

Commit b98050fc authored by Mike Ma's avatar Mike Ma
Browse files

Fix a race condition on ReportHandler::mBatch 

Hold mLock when accessing mBatch and mHandlerLooper in ReportHandler.

Fixes: 147326028
Test: Take an incident report. Verify no race condition.
Change-Id: I9d6da0067731f253532f60e5abb12dfb238b5411
parent 60371300

cmds/incidentd/src/IncidentService.cpp

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ void ReportHandler::handleMessage(const Message& message) { 
}



void ReportHandler::schedulePersistedReport(const IncidentReportArgs& args) {

    unique_lock<mutex> lock(mLock);

    mBatch->addPersistedReport(args);

    mHandlerLooper->removeMessages(this, WHAT_TAKE_REPORT);

    mHandlerLooper->sendMessage(this, Message(WHAT_TAKE_REPORT));
@@ -159,6 +160,7 @@ void ReportHandler::schedulePersistedReport(const IncidentReportArgs& args) { 


void ReportHandler::scheduleStreamingReport(const IncidentReportArgs& args,

        const sp<IIncidentReportStatusListener>& listener, int streamFd) {

    unique_lock<mutex> lock(mLock);

    mBatch->addStreamingReport(args, listener, streamFd);

    mHandlerLooper->removeMessages(this, WHAT_TAKE_REPORT);

    mHandlerLooper->sendMessage(this, Message(WHAT_TAKE_REPORT));

cmds/incidentd/src/Section.cpp

+1 −1
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ status_t TombstoneSection::BlockingCall(unique_fd& pipeWriteFd) const { 
        if (stat(link_name, &fileStat) != OK) {

            continue;

        }

        size_t exe_name_len = readlink(link_name, exe_name, EXE_NAME_LEN);

        ssize_t exe_name_len = readlink(link_name, exe_name, EXE_NAME_LEN);

        if (exe_name_len < 0 || exe_name_len >= EXE_NAME_LEN) {

            ALOGE("[%s] Can't read '%s': %s", name.string(), link_name, strerror(errno));

            continue;