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

Commit 4e82c4a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: avoid ACCEPT_FDS on proxies" am: c7d0e95a am: 7d8a8f17 

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

Change-Id: I414885e6357d8460e8d5ea8a3c286cdf9ec7ae03
parents 01fc068a 7d8a8f17

libs/binder/Parcel.cpp

+3 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) { 
    }



    flat_binder_object obj;

    obj.flags = FLAT_BINDER_FLAG_ACCEPTS_FDS;



    int schedBits = 0;

    if (!IPCThreadState::self()->backgroundSchedulingDisabled()) {
@@ -221,6 +220,7 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) { 
            const int32_t handle = proxy ? proxy->getPrivateAccessor().binderHandle() : 0;

            obj.hdr.type = BINDER_TYPE_HANDLE;

            obj.binder = 0; /* Don't pass uninitialized stack data to a remote process */

            obj.flags = 0;

            obj.handle = handle;

            obj.cookie = 0;

        } else {
@@ -231,6 +231,7 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) { 
                // override value, since it is set explicitly

                schedBits = schedPolicyMask(policy, priority);

            }

            obj.flags = FLAT_BINDER_FLAG_ACCEPTS_FDS;

            if (local->isRequestingSid()) {

                obj.flags |= FLAT_BINDER_FLAG_TXN_SECURITY_CTX;

            }
@@ -243,6 +244,7 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) { 
        }

    } else {

        obj.hdr.type = BINDER_TYPE_BINDER;

        obj.flags = 0;

        obj.binder = 0;

        obj.cookie = 0;

    }