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

Commit aa39c8a5 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Merge "fix use-after-free in adbd_auth" am: 8e3f9dc0 am: 0522e004 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e087b228e84ace35c5b89acd8ef226a5c99a084
parents 4e407a94 0522e004

libs/adbd_auth/adbd_auth.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -282,9 +282,8 @@ public: 
            LOG(FATAL) << "adbd_auth: unhandled packet type?";

            LOG(FATAL) << "adbd_auth: unhandled packet type?";

        }

        }





        output_queue_.pop_front();



        ssize_t rc = writev(framework_fd_.get(), iovs, iovcnt);

        ssize_t rc = writev(framework_fd_.get(), iovs, iovcnt);

        output_queue_.pop_front();

        if (rc == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {

        if (rc == -1 && errno != EAGAIN && errno != EWOULDBLOCK) {

            PLOG(ERROR) << "adbd_auth: failed to write to framework fd";

            PLOG(ERROR) << "adbd_auth: failed to write to framework fd";

            ReplaceFrameworkFd(unique_fd());

            ReplaceFrameworkFd(unique_fd());