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

Commit 9f6d6ae2 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio HAL - fix UAFs 

resolve merge conflicts of bd78085f to pi-dev

Bug: 185259758
Test: N/A
Change-Id: Ia85fb88e85e94b4d63fc155d89063bba6c61e875
Merged-In: I5ec70b098a00746108e10ab39e966607d78c84ae
parent 358f0174

audio/core/all-versions/default/include/core/all-versions/default/StreamIn.impl.h

+4 −4
Original line number Diff line number Diff line
@@ -387,8 +387,8 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    }



    // Create and launch the thread.

    auto tempReadThread =

        std::make_unique<ReadThread>(&mStopReadThread, mStream, tempCommandMQ.get(),

    sp<ReadThread> tempReadThread =

        new ReadThread(&mStopReadThread, mStream, tempCommandMQ.get(),

                       tempDataMQ.get(), tempStatusMQ.get(), tempElfGroup.get());

    if (!tempReadThread->init()) {

        ALOGW("failed to start reader thread: %s", strerror(-status));
@@ -405,7 +405,7 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    mCommandMQ = std::move(tempCommandMQ);

    mDataMQ = std::move(tempDataMQ);

    mStatusMQ = std::move(tempStatusMQ);

    mReadThread = tempReadThread.release();

    mReadThread = tempReadThread;

    mEfGroup = tempElfGroup.release();

    threadInfo.pid = getpid();

    threadInfo.tid = mReadThread->getTid();

audio/core/all-versions/default/include/core/all-versions/default/StreamOut.impl.h

+4 −4
Original line number Diff line number Diff line
@@ -370,8 +370,8 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, uint32_t framesCou 
    }



    // Create and launch the thread.

    auto tempWriteThread =

        std::make_unique<WriteThread>(&mStopWriteThread, mStream, tempCommandMQ.get(),

    sp<WriteThread> tempWriteThread =

        new WriteThread(&mStopWriteThread, mStream, tempCommandMQ.get(),

                        tempDataMQ.get(), tempStatusMQ.get(), tempElfGroup.get());

    if (!tempWriteThread->init()) {

        ALOGW("failed to start writer thread: %s", strerror(-status));
@@ -388,7 +388,7 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, uint32_t framesCou 
    mCommandMQ = std::move(tempCommandMQ);

    mDataMQ = std::move(tempDataMQ);

    mStatusMQ = std::move(tempStatusMQ);

    mWriteThread = tempWriteThread.release();

    mWriteThread = tempWriteThread;

    mEfGroup = tempElfGroup.release();

    threadInfo.pid = getpid();

    threadInfo.tid = mWriteThread->getTid();