Skip to content

Commit 009229d

Browse files
Steven Morelandandroid-build-merge-worker-robot
authored andcommitted
libbinder: Parcel: grow rejects large data pos am: 0db4fce am: 788803b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/29918554 Change-Id: I3ae0fdcdd6e73c68c48ac7d35671a8a1e750b75c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents 3f8ed18 + 788803b commit 009229d

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

libs/binder/Parcel.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,6 +2253,14 @@ status_t Parcel::growData(size_t len)
22532253
return BAD_VALUE;
22542254
}
22552255

2256+
if (mDataPos > mDataSize) {
2257+
// b/370831157 - this case used to abort. We also don't expect mDataPos < mDataSize, but
2258+
// this would only waste a bit of memory, so it's okay.
2259+
ALOGE("growData only expected at the end of a Parcel. pos: %zu, size: %zu, capacity: %zu",
2260+
mDataPos, len, mDataCapacity);
2261+
return BAD_VALUE;
2262+
}
2263+
22562264
if (len > SIZE_MAX - mDataSize) return NO_MEMORY; // overflow
22572265
if (mDataSize + len > SIZE_MAX / 3) return NO_MEMORY; // overflow
22582266
size_t newSize = ((mDataSize+len)*3)/2;

0 commit comments

Comments
 (0)