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

Unverified Commit f3e14c38 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-10.0.0_r57' into staging/lineage-17.1_merge_android-security-10.0.0_r57 

Android Security 10.0.0 Release 57 (7483358)

* tag 'android-security-10.0.0_r57':
  [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged

Change-Id: I4d2908fe5fe7507185f9176e44f6595602b351e4
parents b3228156 06fab147

cmds/statsd/src/guardrail/StatsdStats.cpp

+4 −1
Original line number Diff line number Diff line
@@ -449,9 +449,12 @@ void StatsdStats::notePullExceedMaxDelay(int pullAtomId) { 
void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {

    lock_guard<std::mutex> lock(mLock);



    if (atomId <= android::util::kMaxPushedAtomId) {

    if (atomId >= 0 && atomId <= android::util::kMaxPushedAtomId) {

        mPushedAtomStats[atomId]++;

    } else {

        if (atomId < 0) {

            android_errorWriteLog(0x534e4554, "187957589");

        }

        if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) {

            mNonPlatformPushedAtomStats[atomId]++;

        }