Merge "libbinder: Parcel: validate read data before write" into sc-dev (538e27fa) · Commits · e / os / android_frameworks_native

libs/binder/Parcel.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -796,6 +796,10 @@ restart_write:
		//printf("Writing %ld bytes, padded to %ld\n", len, padded);
		uint8_t* const data = mData+mDataPos;

		if (status_t status = validateReadData(mDataPos + padded); status != OK) {
		return nullptr; // drops status
		}

		// Need to pad at end?
		if (padded != len) {
		#if BYTE_ORDER == BIG_ENDIAN
		@@ -1313,6 +1317,10 @@ status_t Parcel::writeObject(const flat_binder_object& val, bool nullMetaData)
		const bool enoughObjects = mObjectsSize < mObjectsCapacity;
		if (enoughData && enoughObjects) {
		restart_write:
		if (status_t status = validateReadData(mDataPos + sizeof(val)); status != OK) {
		return status;
		}

		reinterpret_cast<flat_binder_object>(mData+mDataPos) = val;

		// remember if it's a file descriptor
		@@ -1505,6 +1513,10 @@ status_t Parcel::writeAligned(T val) {

		if ((mDataPos+sizeof(val)) <= mDataCapacity) {
		restart_write:
		if (status_t status = validateReadData(mDataPos + sizeof(val)); status != OK) {
		return status;
		}

		reinterpret_cast<T>(mData+mDataPos) = val;
		return finishWrite(sizeof(val));
		}