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

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

Merge "libbinder: RpcServer protocol version error" am: 2e96fc97 am: 5e2251df 

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



Change-Id: I061df307ab049a36ac191869e1bba66b1503f4e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce45cafd 5e2251df

libs/binder/RpcServer.cpp

+6 −1
Original line number Diff line number Diff line
@@ -124,8 +124,13 @@ size_t RpcServer::getMaxThreads() { 
    return mMaxThreads;

}



void RpcServer::setProtocolVersion(uint32_t version) {

bool RpcServer::setProtocolVersion(uint32_t version) {

    if (!RpcState::validateProtocolVersion(version)) {

        return false;

    }



    mProtocolVersion = version;

    return true;

}



void RpcServer::setSupportedFileDescriptorTransportModes(

libs/binder/RpcSession.cpp

+1 −5
Original line number Diff line number Diff line
@@ -104,11 +104,7 @@ size_t RpcSession::getMaxOutgoingThreads() { 
}



bool RpcSession::setProtocolVersionInternal(uint32_t version, bool checkStarted) {

    if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT &&

        version != RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {

        ALOGE("Cannot start RPC session with version %u which is unknown (current protocol version "

              "is %u).",

              version, RPC_WIRE_PROTOCOL_VERSION);

    if (!RpcState::validateProtocolVersion(version)) {

        return false;

    }

libs/binder/RpcState.cpp

+12 −0
Original line number Diff line number Diff line
@@ -398,6 +398,18 @@ status_t RpcState::rpcRec( 
    return OK;

}



bool RpcState::validateProtocolVersion(uint32_t version) {

    if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT &&

        version != RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {

        ALOGE("Cannot use RPC binder protocol version %u which is unknown (current protocol "

              "version "

              "is %u).",

              version, RPC_WIRE_PROTOCOL_VERSION);

        return false;

    }

    return true;

}



status_t RpcState::readNewSessionResponse(const sp<RpcSession::RpcConnection>& connection,

                                          const sp<RpcSession>& session, uint32_t* version) {

    RpcNewSessionResponse response;

libs/binder/RpcState.h

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ public: 
    RpcState();

    ~RpcState();



    [[nodiscard]] static bool validateProtocolVersion(uint32_t version);



    [[nodiscard]] status_t readNewSessionResponse(const sp<RpcSession::RpcConnection>& connection,

                                                  const sp<RpcSession>& session, uint32_t* version);

    [[nodiscard]] status_t sendConnectionInit(const sp<RpcSession::RpcConnection>& connection,

libs/binder/include/binder/RpcServer.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public: 
     * used. However, this can be used in order to prevent newer protocol

     * versions from ever being used. This is expected to be useful for testing.

     */

    void setProtocolVersion(uint32_t version);

    [[nodiscard]] bool setProtocolVersion(uint32_t version);



    /**

     * Set the supported transports for sending and receiving file descriptors.