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

Commit 7b9d4bb4 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal@aidl: Abort on data FMQ pointer corruption" into main am:... 

Merge "libaudiohal@aidl: Abort on data FMQ pointer corruption" into main am: ec4a0953 am: 37b8fabb

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3080223



Change-Id: I4cb3f799bc563a6e3782c80eb8bb5201cc2699fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39488d11 37b8fabb

media/libaudiohal/impl/StreamHalAidl.cpp

+7 −2
Original line number Diff line number Diff line
@@ -327,8 +327,11 @@ status_t StreamHalAidl::transfer(void *buffer, size_t bytes, size_t *transferred 
            return INVALID_OPERATION;

        }

    }

    StreamContextAidl::DataMQ::Error fmqError = StreamContextAidl::DataMQ::Error::NONE;

    std::string fmqErrorMsg;

    if (!mIsInput) {

        bytes = std::min(bytes, mContext.getDataMQ()->availableToWrite());

        bytes = std::min(bytes,

                mContext.getDataMQ()->availableToWrite(&fmqError, &fmqErrorMsg));

    }

    StreamDescriptor::Command burst =

            StreamDescriptor::Command::make<StreamDescriptor::Command::Tag::burst>(bytes);
@@ -345,12 +348,14 @@ status_t StreamHalAidl::transfer(void *buffer, size_t bytes, size_t *transferred 
        LOG_ALWAYS_FATAL_IF(*transferred > bytes,

                "%s: HAL module read %zu bytes, which exceeds requested count %zu",

                __func__, *transferred, bytes);

        if (auto toRead = mContext.getDataMQ()->availableToRead();

        if (auto toRead = mContext.getDataMQ()->availableToRead(&fmqError, &fmqErrorMsg);

                toRead != 0 && !mContext.getDataMQ()->read(static_cast<int8_t*>(buffer), toRead)) {

            ALOGE("%s: failed to read %zu bytes to data MQ", __func__, toRead);

            return NOT_ENOUGH_DATA;

        }

    }

    LOG_ALWAYS_FATAL_IF(fmqError != StreamContextAidl::DataMQ::Error::NONE,

            "%s", fmqErrorMsg.c_str());

    mStreamPowerLog.log(buffer, *transferred);

    return OK;

}