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

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

Merge "Fix refcounting on thread creation failure path for android_res_nsend()" am: b3b845f5 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1470463

Change-Id: Idc6ed5a8ab4527a5b142fa98c36d3896e236b1f7
parents ba4abf75 b3b845f5

DnsProxyListener.cpp

+21 −42
Original line number Diff line number Diff line
@@ -84,25 +84,6 @@ void logArguments(int argc, char** argv) { 
    }

}



template<typename T>

void tryThreadOrError(SocketClient* cli, T* handler) {

    cli->incRef();



    const int rval = netdutils::threadLaunch(handler);

    if (rval == 0) {

        // SocketClient decRef() happens in the handler's run() method.

        return;

    }



    char* msg = nullptr;

    asprintf(&msg, "%s (%d)", strerror(-rval), -rval);

    cli->sendMsg(ResponseCode::OperationFailed, msg, false);

    free(msg);



    delete handler;

    cli->decRef();

}



bool checkAndClearUseLocalNameserversFlag(unsigned* netid) {

    if (netid == nullptr || ((*netid) & NETID_USE_LOCAL_NAMESERVERS) == 0) {

        return false;
@@ -563,10 +544,23 @@ DnsProxyListener::DnsProxyListener() : FrameworkListener(SOCKET_NAME) { 
    registerCmd(new GetDnsNetIdCommand());

}



void DnsProxyListener::Handler::spawn() {

    const int rval = netdutils::threadLaunch(this);

    if (rval == 0) {

        return;

    }



    char* msg = nullptr;

    asprintf(&msg, "%s (%d)", strerror(-rval), -rval);

    mClient->sendMsg(ResponseCode::OperationFailed, msg, false);

    free(msg);

    delete this;

}



DnsProxyListener::GetAddrInfoHandler::GetAddrInfoHandler(SocketClient* c, char* host, char* service,

                                                         addrinfo* hints,

                                                         const android_net_context& netcontext)

    : mClient(c), mHost(host), mService(service), mHints(hints), mNetContext(netcontext) {}

    : Handler(c), mHost(host), mService(service), mHints(hints), mNetContext(netcontext) {}



DnsProxyListener::GetAddrInfoHandler::~GetAddrInfoHandler() {

    free(mHost);
@@ -763,7 +757,6 @@ void DnsProxyListener::GetAddrInfoHandler::run() { 
    reportDnsEvent(INetdEventListener::EVENT_GETADDRINFO, mNetContext, latencyUs, rv, event, mHost,

                   ip_addrs, total_ip_addr_count);

    freeaddrinfo(result);

    mClient->decRef();

}



std::string DnsProxyListener::GetAddrInfoHandler::threadName() {
@@ -841,9 +834,7 @@ int DnsProxyListener::GetAddrInfoCmd::runCommand(SocketClient *cli, 
        hints->ai_protocol = ai_protocol;

    }



    DnsProxyListener::GetAddrInfoHandler* handler =

            new DnsProxyListener::GetAddrInfoHandler(cli, name, service, hints, netcontext);

    tryThreadOrError(cli, handler);

    (new GetAddrInfoHandler(cli, name, service, hints, netcontext))->spawn();

    return 0;

}
@@ -888,19 +879,13 @@ int DnsProxyListener::ResNSendCommand::runCommand(SocketClient* cli, int argc, c 
        netcontext.flags |= NET_CONTEXT_FLAG_USE_LOCAL_NAMESERVERS;

    }



    DnsProxyListener::ResNSendHandler* handler =

            new DnsProxyListener::ResNSendHandler(cli, argv[3], flags, netcontext);

    tryThreadOrError(cli, handler);

    (new ResNSendHandler(cli, argv[3], flags, netcontext))->spawn();

    return 0;

}



DnsProxyListener::ResNSendHandler::ResNSendHandler(SocketClient* c, std::string msg, uint32_t flags,

                                                   const android_net_context& netcontext)

    : mClient(c), mMsg(std::move(msg)), mFlags(flags), mNetContext(netcontext) {}



DnsProxyListener::ResNSendHandler::~ResNSendHandler() {

    mClient->decRef();

}

    : Handler(c), mMsg(std::move(msg)), mFlags(flags), mNetContext(netcontext) {}



void DnsProxyListener::ResNSendHandler::run() {

    LOG(DEBUG) << "ResNSendHandler::run: " << mFlags << " / {" << mNetContext.app_netid << " "
@@ -1090,15 +1075,13 @@ int DnsProxyListener::GetHostByNameCmd::runCommand(SocketClient *cli, 
        netcontext.flags |= NET_CONTEXT_FLAG_USE_LOCAL_NAMESERVERS;

    }



    DnsProxyListener::GetHostByNameHandler* handler =

            new DnsProxyListener::GetHostByNameHandler(cli, name, af, netcontext);

    tryThreadOrError(cli, handler);

    (new GetHostByNameHandler(cli, name, af, netcontext))->spawn();

    return 0;

}



DnsProxyListener::GetHostByNameHandler::GetHostByNameHandler(SocketClient* c, char* name, int af,

                                                             const android_net_context& netcontext)

    : mClient(c), mName(name), mAf(af), mNetContext(netcontext) {}

    : Handler(c), mName(name), mAf(af), mNetContext(netcontext) {}



DnsProxyListener::GetHostByNameHandler::~GetHostByNameHandler() {

    free(mName);
@@ -1190,7 +1173,6 @@ void DnsProxyListener::GetHostByNameHandler::run() { 
    const int total_ip_addr_count = extractGetHostByNameAnswers(hp, &ip_addrs);

    reportDnsEvent(INetdEventListener::EVENT_GETHOSTBYNAME, mNetContext, latencyUs, rv, event,

                   mName, ip_addrs, total_ip_addr_count);

    mClient->decRef();

}



std::string DnsProxyListener::GetHostByNameHandler::threadName() {
@@ -1242,16 +1224,14 @@ int DnsProxyListener::GetHostByAddrCmd::runCommand(SocketClient *cli, 
        netcontext.flags |= NET_CONTEXT_FLAG_USE_LOCAL_NAMESERVERS;

    }



    DnsProxyListener::GetHostByAddrHandler* handler = new DnsProxyListener::GetHostByAddrHandler(

            cli, addr, addrLen, addrFamily, netcontext);

    tryThreadOrError(cli, handler);

    (new GetHostByAddrHandler(cli, addr, addrLen, addrFamily, netcontext))->spawn();

    return 0;

}



DnsProxyListener::GetHostByAddrHandler::GetHostByAddrHandler(SocketClient* c, void* address,

                                                             int addressLen, int addressFamily,

                                                             const android_net_context& netcontext)

    : mClient(c),

    : Handler(c),

      mAddress(address),

      mAddressLen(addressLen),

      mAddressFamily(addressFamily),
@@ -1351,7 +1331,6 @@ void DnsProxyListener::GetHostByAddrHandler::run() { 


    reportDnsEvent(INetdEventListener::EVENT_GETHOSTBYADDR, mNetContext, latencyUs, rv, event,

                   (hp && hp->h_name) ? hp->h_name : "null", {}, 0);

    mClient->decRef();

}



std::string DnsProxyListener::GetHostByAddrHandler::threadName() {

DnsProxyListener.h

+33 −21
Original line number Diff line number Diff line
@@ -38,6 +38,23 @@ class DnsProxyListener : public FrameworkListener { 
    static constexpr const char* SOCKET_NAME = "dnsproxyd";



  private:

    class Handler {

      public:

        Handler(SocketClient* c) : mClient(c) { mClient->incRef(); }

        virtual ~Handler() { mClient->decRef(); }

        void operator=(const Handler&) = delete;



        // Attept to spawn the worker thread, or return an error to the client.

        // The Handler instance will self-delete in either case.

        void spawn();



        virtual void run() = 0;

        virtual std::string threadName() = 0;



        SocketClient* mClient;  // ref-counted

    };



    /* ------ getaddrinfo ------*/

    class GetAddrInfoCmd : public FrameworkCommand {

      public:

        GetAddrInfoCmd();
@@ -45,21 +62,19 @@ class DnsProxyListener : public FrameworkListener { 
        int runCommand(SocketClient* c, int argc, char** argv) override;

    };



    /* ------ getaddrinfo ------*/

    class GetAddrInfoHandler {

    class GetAddrInfoHandler : public Handler {

      public:

        // Note: All of host, service, and hints may be NULL

        GetAddrInfoHandler(SocketClient* c, char* host, char* service, addrinfo* hints,

                           const android_net_context& netcontext);

        ~GetAddrInfoHandler();

        ~GetAddrInfoHandler() override;



        void run();

        std::string threadName();

        void run() override;

        std::string threadName() override;



      private:

        void doDns64Synthesis(int32_t* rv, addrinfo** res, NetworkDnsEventReported* event);



        SocketClient* mClient;  // ref counted

        char* mHost;            // owned. TODO: convert to std::string.

        char* mService;         // owned. TODO: convert to std::string.

        addrinfo* mHints;       // owned
@@ -74,20 +89,19 @@ class DnsProxyListener : public FrameworkListener { 
        int runCommand(SocketClient* c, int argc, char** argv) override;

    };



    class GetHostByNameHandler {

    class GetHostByNameHandler : public Handler {

      public:

        GetHostByNameHandler(SocketClient* c, char* name, int af,

                             const android_net_context& netcontext);

        ~GetHostByNameHandler();

        ~GetHostByNameHandler() override;



        void run();

        std::string threadName();

        void run() override;

        std::string threadName() override;



      private:

        void doDns64Synthesis(int32_t* rv, hostent* hbuf, char* buf, size_t buflen, hostent** hpp,

                              NetworkDnsEventReported* event);



        SocketClient* mClient;  // ref counted

        char* mName;            // owned. TODO: convert to std::string.

        int mAf;

        android_net_context mNetContext;
@@ -101,20 +115,19 @@ class DnsProxyListener : public FrameworkListener { 
        int runCommand(SocketClient* c, int argc, char** argv) override;

    };



    class GetHostByAddrHandler {

    class GetHostByAddrHandler : public Handler {

      public:

        GetHostByAddrHandler(SocketClient* c, void* address, int addressLen, int addressFamily,

                             const android_net_context& netcontext);

        ~GetHostByAddrHandler();

        ~GetHostByAddrHandler() override;



        void run();

        std::string threadName();

        void run() override;

        std::string threadName() override;



      private:

        void doDns64ReverseLookup(hostent* hbuf, char* buf, size_t buflen, hostent** hpp,

                                  NetworkDnsEventReported* event);



        SocketClient* mClient;  // ref counted

        void* mAddress;         // address to lookup; owned

        int mAddressLen;        // length of address to look up

        int mAddressFamily;     // address family
@@ -129,17 +142,16 @@ class DnsProxyListener : public FrameworkListener { 
        int runCommand(SocketClient* c, int argc, char** argv) override;

    };



    class ResNSendHandler {

    class ResNSendHandler : public Handler {

      public:

        ResNSendHandler(SocketClient* c, std::string msg, uint32_t flags,

                        const android_net_context& netcontext);

        ~ResNSendHandler();

        ~ResNSendHandler() override = default;



        void run();

        std::string threadName();

        void run() override;

        std::string threadName() override;



      private:

        SocketClient* mClient;  // ref counted

        std::string mMsg;

        uint32_t mFlags;

        android_net_context mNetContext;