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

Commit e95795fd authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

libbinder: Parcel: grow rejects large data pos am: 0db4fced am: 788803b5... 

libbinder: Parcel: grow rejects large data pos am: 0db4fced am: 788803b5 am: 009229d9 am: abfcdc86

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/29918554



Change-Id: I9bbf83f06e6234fb4d30e0adb9b5666635fc5476
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ae8d5b1 abfcdc86

libs/binder/Parcel.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2370,6 +2370,14 @@ status_t Parcel::growData(size_t len) 
        return BAD_VALUE;

    }



    if (mDataPos > mDataSize) {

        // b/370831157 - this case used to abort. We also don't expect mDataPos < mDataSize, but

        // this would only waste a bit of memory, so it's okay.

        ALOGE("growData only expected at the end of a Parcel. pos: %zu, size: %zu, capacity: %zu",

              mDataPos, len, mDataCapacity);

        return BAD_VALUE;

    }



    if (len > SIZE_MAX - mDataSize) return NO_MEMORY; // overflow

    if (mDataSize + len > SIZE_MAX / 3) return NO_MEMORY; // overflow

    size_t newSize = ((mDataSize+len)*3)/2;