| commit | aa39c8a536ed125b312ce3f58bf2bbe3631d1462 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Wed Jan 06 04:58:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 06 04:58:13 2021 +0000 |
| tree | aaee224ed752bd8aa9a0ca8928a2bb186d0edb7a | |
| parent | 4e407a9442626ac1a9a3f5e4090b07e597603f15 [diff] | |
| parent | 0522e004bd1750baa8ec2e5837fcfd8c85020d7a [diff] |
Merge "fix use-after-free in adbd_auth" am: 8e3f9dc03d am: 0522e004bd Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1539159 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e087b228e84ace35c5b89acd8ef226a5c99a084
diff --git a/libs/adbd_auth/adbd_auth.cpp b/libs/adbd_auth/adbd_auth.cpp index dae6eeb..15bd5c3 100644 --- a/libs/adbd_auth/adbd_auth.cpp +++ b/libs/adbd_auth/adbd_auth.cpp
@@ -282,9 +282,8 @@ LOG(FATAL) << "adbd_auth: unhandled packet type?"; } - output_queue_.pop_front(); - ssize_t rc = writev(framework_fd_.get(), iovs, iovcnt); + output_queue_.pop_front(); if (rc == -1 && errno != EAGAIN && errno != EWOULDBLOCK) { PLOG(ERROR) << "adbd_auth: failed to write to framework fd"; ReplaceFrameworkFd(unique_fd());