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

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

Merge changes Ibdbe8161,Id2b0fc02 am: e59437a4 

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

Change-Id: I927d03e2a932a9ae4e35aa393ebf30aab4ee0b9e
parents 4a2b6282 e59437a4

libs/binder/Parcel.cpp

+8 −0
Original line number Diff line number Diff line
@@ -555,12 +555,17 @@ void Parcel::markSensitive() const 
}



void Parcel::markForBinder(const sp<IBinder>& binder) {

    LOG_ALWAYS_FATAL_IF(mData != nullptr, "format must be set before data is written");



    if (binder && binder->remoteBinder() && binder->remoteBinder()->isRpcBinder()) {

        markForRpc(binder->remoteBinder()->getPrivateAccessorForId().rpcConnection());

    }

}



void Parcel::markForRpc(const sp<RpcConnection>& connection) {

    LOG_ALWAYS_FATAL_IF(mData != nullptr && mOwner == nullptr,

                        "format must be set before data is written OR on IPC data");



    LOG_ALWAYS_FATAL_IF(connection == nullptr, "markForRpc requires connection");

    mConnection = connection;

}
@@ -2100,6 +2105,9 @@ size_t Parcel::ipcObjectsCount() const 
void Parcel::ipcSetDataReference(const uint8_t* data, size_t dataSize,

    const binder_size_t* objects, size_t objectsCount, release_func relFunc)

{

    // this code uses 'mOwner == nullptr' to understand whether it owns memory

    LOG_ALWAYS_FATAL_IF(relFunc == nullptr, "must provide cleanup function");



    freeData();



    mData = const_cast<uint8_t*>(data);

libs/binder/RpcState.cpp

+18 −4
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ status_t RpcState::transact(const base::unique_fd& fd, const RpcAddress& address 
    return waitForReply(fd, connection, reply);

}



static void cleanup_data(Parcel* p, const uint8_t* data, size_t dataSize,

static void cleanup_reply_data(Parcel* p, const uint8_t* data, size_t dataSize,

                               const binder_size_t* objects, size_t objectsCount) {

    (void)p;

    delete[] const_cast<uint8_t*>(data - offsetof(RpcWireReply, data));
@@ -351,7 +351,7 @@ status_t RpcState::waitForReply(const base::unique_fd& fd, const sp<RpcConnectio 
    if (rpcReply->status != OK) return rpcReply->status;



    reply->ipcSetDataReference(rpcReply->data, command.bodySize - offsetof(RpcWireReply, data),

                               nullptr, 0, cleanup_data);

                               nullptr, 0, cleanup_reply_data);



    reply->markForRpc(connection);
@@ -427,6 +427,15 @@ status_t RpcState::processTransact(const base::unique_fd& fd, const sp<RpcConnec 
    return processTransactInternal(fd, connection, std::move(transactionData));

}



static void do_nothing_to_transact_data(Parcel* p, const uint8_t* data, size_t dataSize,

                                        const binder_size_t* objects, size_t objectsCount) {

    (void)p;

    (void)data;

    (void)dataSize;

    (void)objects;

    (void)objectsCount;

}



status_t RpcState::processTransactInternal(const base::unique_fd& fd,

                                           const sp<RpcConnection>& connection,

                                           std::vector<uint8_t>&& transactionData) {
@@ -490,7 +499,12 @@ status_t RpcState::processTransactInternal(const base::unique_fd& fd, 
    }



    Parcel data;

    data.setData(transaction->data, transactionData.size() - offsetof(RpcWireTransaction, data));

    // transaction->data is owned by this function. Parcel borrows this data and

    // only holds onto it for the duration of this function call. Parcel will be

    // deleted before the 'transactionData' object.

    data.ipcSetDataReference(transaction->data,

                             transactionData.size() - offsetof(RpcWireTransaction, data),

                             nullptr /*object*/, 0 /*objectCount*/, do_nothing_to_transact_data);

    data.markForRpc(connection);



    Parcel reply;

libs/binder/include/binder/Parcel.h

+4 −4
Original line number Diff line number Diff line
@@ -101,10 +101,6 @@ public: 
    // is for an RPC transaction).

    void markForBinder(const sp<IBinder>& binder);



    // Whenever possible, markForBinder should be preferred. This method is

    // called automatically on reply Parcels for RPC transactions.

    void markForRpc(const sp<RpcConnection>& connection);



    // Whether this Parcel is written for RPC transactions (after calls to

    // markForBinder or markForRpc).

    bool isForRpc() const;
@@ -540,6 +536,10 @@ private: 
                                            const binder_size_t* objects, size_t objectsCount,

                                            release_func relFunc);



    // Whenever possible, markForBinder should be preferred. This method is

    // called automatically on reply Parcels for RPC transactions.

    void markForRpc(const sp<RpcConnection>& connection);



    status_t            finishWrite(size_t len);

    void                releaseObjects();

    void                acquireObjects();

libs/binder/include/binder/RpcConnection.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ public: 
    };



private:

    friend sp<RpcConnection>;

    RpcConnection();



    bool addServer(const SocketAddress& address);

libs/binder/ndk/ibinder.cpp

+2 −0
Original line number Diff line number Diff line
@@ -598,6 +598,8 @@ binder_status_t AIBinder_prepareTransaction(AIBinder* binder, AParcel** in) { 
    }



    *in = new AParcel(binder);

    (*in)->get()->markForBinder(binder->getBinder());



    status_t status = (*in)->get()->writeInterfaceToken(clazz->getInterfaceDescriptor());

    binder_status_t ret = PruneStatusT(status);