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

Commit 1a7aea29 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Protect objects in Parcel::appendFrom" into udc-dev am: 84a880c4 am: 7c3ce8cb 

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



Change-Id: If1aa814fcf922eb888631904026faf03b16c83d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1a75de3 7c3ce8cb

libs/binder/Parcel.cpp

+28 −12
Original line number Diff line number Diff line
@@ -493,6 +493,11 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
        return BAD_VALUE;

    }



    // Make sure we aren't appending over objects.

    if (status_t status = validateReadData(mDataPos + len); status != OK) {

        return status;

    }



    if ((mDataPos + len) > mDataCapacity) {

        // grow data

        err = growData(len);
@@ -516,17 +521,13 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
        const binder_size_t* objects = otherKernelFields->mObjects;

        size_t size = otherKernelFields->mObjectsSize;

        // Count objects in range

        int firstIndex = -1, lastIndex = -2;

        int numObjects = 0;

        for (int i = 0; i < (int)size; i++) {

            size_t off = objects[i];

            if ((off >= offset) && (off + sizeof(flat_binder_object) <= offset + len)) {

                if (firstIndex == -1) {

                    firstIndex = i;

                }

                lastIndex = i;

            size_t pos = objects[i];

            if ((pos >= offset) && (pos + sizeof(flat_binder_object) <= offset + len)) {

                numObjects++;

            }

        }

        int numObjects = lastIndex - firstIndex + 1;

        if (numObjects > 0) {

            const sp<ProcessState> proc(ProcessState::self());

            // grow objects
@@ -548,8 +549,12 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 


            // append and acquire objects

            int idx = kernelFields->mObjectsSize;

            for (int i = firstIndex; i <= lastIndex; i++) {

                size_t off = objects[i] - offset + startPos;

            for (int i = 0; i < (int)size; i++) {

                size_t pos = objects[i];

                if (!(pos >= offset) || !(pos + sizeof(flat_binder_object) <= offset + len)) {

                    continue;

                }

                size_t off = pos - offset + startPos;

                kernelFields->mObjects[idx++] = off;

                kernelFields->mObjectsSize++;
@@ -568,6 +573,9 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
                    }

                }

            }

            // Always clear sorted flag. It is tricky to infer if the append

            // result maintains the sort or not.

            kernelFields->mObjectsSorted = false;

        }

#else

        LOG_ALWAYS_FATAL("Binder kernel driver disabled at build time");
@@ -598,7 +606,10 @@ status_t Parcel::appendFrom(const Parcel* parcel, size_t offset, size_t len) { 
            const binder_size_t objPos = otherRpcFields->mObjectPositions[i];

            if (offset <= objPos && objPos < offset + len) {

                size_t newDataPos = objPos - offset + startPos;

                rpcFields->mObjectPositions.push_back(newDataPos);

                rpcFields->mObjectPositions

                        .insert(std::upper_bound(rpcFields->mObjectPositions.begin(),

                                                 rpcFields->mObjectPositions.end(), newDataPos),

                                newDataPos);



                mDataPos = newDataPos;

                int32_t objectType;
@@ -1473,7 +1484,10 @@ status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) { 
                if (status_t err = writeInt32(rpcFields->mFds->size()); err != OK) {

                    return err;

                }

                rpcFields->mObjectPositions.push_back(dataPos);

                rpcFields->mObjectPositions

                        .insert(std::upper_bound(rpcFields->mObjectPositions.begin(),

                                                 rpcFields->mObjectPositions.end(), dataPos),

                                dataPos);

                rpcFields->mFds->push_back(std::move(fdVariant));

                return OK;

            }
@@ -1672,6 +1686,8 @@ restart_write: 
            kernelFields->mObjects[kernelFields->mObjectsSize] = mDataPos;

            acquire_object(ProcessState::self(), val, this);

            kernelFields->mObjectsSize++;

            // Clear sorted flag if we aren't appending to the end.

            kernelFields->mObjectsSorted &= mDataPos == mDataSize;

        }



        return finishWrite(sizeof(flat_binder_object));

libs/binder/tests/binderParcelUnitTest.cpp

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ using android::IBinder; 
using android::IPCThreadState;

using android::OK;

using android::Parcel;

using android::PERMISSION_DENIED;

using android::sp;

using android::status_t;

using android::String16;
@@ -123,6 +124,16 @@ TEST(Parcel, AppendWithBadDataPos) { 
    EXPECT_EQ(android::BAD_VALUE, p2.appendFrom(&p1, 0, 8));

}



TEST(Parcel, AppendOverObject) {

    Parcel p1;

    p1.writeDupFileDescriptor(0);

    Parcel p2;

    p2.writeInt32(2);



    p1.setDataPosition(8);

    ASSERT_EQ(PERMISSION_DENIED, p1.appendFrom(&p2, 0, p2.dataSize()));

}



// Tests a second operation results in a parcel at the same location as it

// started.

void parcelOpSameLength(const std::function<void(Parcel*)>& a, const std::function<void(Parcel*)>& b) {