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

Commit cbae5189 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge changes I82c49085,Ic2e461c1 

* changes:
  binder_parcel_fuzzer: fuzz RPC format
  libbinder: organize fuzzers
parents f6b49d7e d47b32cd

libs/binder/RpcConnection.cpp

+25 −9
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ private: 
};



bool RpcConnection::setupUnixDomainServer(const char* path) {

    return addServer(UnixSocketAddress(path));

    return setupSocketServer(UnixSocketAddress(path));

}



bool RpcConnection::addUnixDomainClient(const char* path) {

    return addClient(UnixSocketAddress(path));

    return addSocketClient(UnixSocketAddress(path));

}



#ifdef __BIONIC__
@@ -111,15 +111,27 @@ bool RpcConnection::setupVsockServer(unsigned int port) { 
    // realizing value w/ this type at compile time to avoid ubsan abort

    constexpr unsigned int kAnyCid = VMADDR_CID_ANY;



    return addServer(VsockSocketAddress(kAnyCid, port));

    return setupSocketServer(VsockSocketAddress(kAnyCid, port));

}



bool RpcConnection::addVsockClient(unsigned int cid, unsigned int port) {

    return addClient(VsockSocketAddress(cid, port));

    return addSocketClient(VsockSocketAddress(cid, port));

}



#endif // __BIONIC__



bool RpcConnection::addNullDebuggingClient() {

    unique_fd serverFd(TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY | O_CLOEXEC)));



    if (serverFd == -1) {

        ALOGE("Could not connect to /dev/null: %s", strerror(errno));

        return false;

    }



    addClient(std::move(serverFd));

    return true;

}



sp<IBinder> RpcConnection::getRootObject() {

    ExclusiveSocket socket(sp<RpcConnection>::fromExisting(this), SocketUse::CLIENT);

    return state()->getRootObject(socket.fd(), sp<RpcConnection>::fromExisting(this));
@@ -180,7 +192,7 @@ wp<RpcServer> RpcConnection::server() { 
    return mForServer;

}



bool RpcConnection::addServer(const SocketAddress& addr) {

bool RpcConnection::setupSocketServer(const SocketAddress& addr) {

    LOG_ALWAYS_FATAL_IF(mServer.get() != -1, "Each RpcConnection can only have one server.");



    unique_fd serverFd(
@@ -206,7 +218,7 @@ bool RpcConnection::addServer(const SocketAddress& addr) { 
    return true;

}



bool RpcConnection::addClient(const SocketAddress& addr) {

bool RpcConnection::addSocketClient(const SocketAddress& addr) {

    unique_fd serverFd(

            TEMP_FAILURE_RETRY(socket(addr.addr()->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0)));

    if (serverFd == -1) {
@@ -223,14 +235,18 @@ bool RpcConnection::addClient(const SocketAddress& addr) { 


    LOG_RPC_DETAIL("Socket at %s client with fd %d", addr.toString().c_str(), serverFd.get());



    addClient(std::move(serverFd));

    return true;

}



void RpcConnection::addClient(unique_fd&& fd) {

    std::lock_guard<std::mutex> _l(mSocketMutex);

    sp<ConnectionSocket> connection = sp<ConnectionSocket>::make();

    connection->fd = std::move(serverFd);

    connection->fd = std::move(fd);

    mClients.push_back(connection);

    return true;

}



void RpcConnection::assignServerToThisThread(base::unique_fd&& fd) {

void RpcConnection::assignServerToThisThread(unique_fd&& fd) {

    std::lock_guard<std::mutex> _l(mSocketMutex);

    sp<ConnectionSocket> connection = sp<ConnectionSocket>::make();

    connection->fd = std::move(fd);

libs/binder/include/binder/Parcel.h

+4 −4
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ 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;
@@ -536,10 +540,6 @@ 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

+12 −2
Original line number Diff line number Diff line
@@ -73,6 +73,15 @@ public: 
    [[nodiscard]] bool addVsockClient(unsigned int cvd, unsigned int port);

#endif // __BIONIC__



    /**

     * For debugging!

     *

     * Sets up an empty socket. All queries to this socket which require a

     * response will never be satisfied. All data sent here will be

     * unceremoniously cast down the bottomless pit, /dev/null.

     */

    [[nodiscard]] bool addNullDebuggingClient();



    /**

     * Query the other side of the connection for the root object hosted by that

     * process's RpcServer (if one exists)
@@ -109,8 +118,9 @@ private: 
    friend sp<RpcConnection>;

    RpcConnection();



    bool addServer(const SocketAddress& address);

    bool addClient(const SocketAddress& address);

    bool setupSocketServer(const SocketAddress& address);

    bool addSocketClient(const SocketAddress& address);

    void addClient(base::unique_fd&& fd);

    void assignServerToThisThread(base::unique_fd&& fd);



    struct ConnectionSocket : public RefBase {