commit 9ba4bd39062ebfee8f61ff0308294d527df819f3
author Jeff Vander Stoep <jeffv@google.com> Fri Oct 01 06:28:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 01 06:28:27 2021 +0000
tree adb4cea23cc977ed5ea538df3c35472bf98c6d3f
parent 91768a57b7138166e0a3d11f79cd55909dda7014
parent 58a73ad7cbe0f1a304c96438b147a5b715bd340c

Add SOCK_CLOEXEC to adbd's vsock socket am: 58a73ad7cb

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

Change-Id: Ie01e1c52c8b156508ec4cd5f629ec7b543220982

socket_spec.cpp

diff --git a/socket_spec.cpp b/socket_spec.cpp
index c93b023..a71b2c9 100644
--- a/socket_spec.cpp
+++ b/socket_spec.cpp
@@ -264,7 +264,7 @@
             errno = EINVAL;
             return false;
         }
-        fd->reset(socket(AF_VSOCK, SOCK_STREAM, 0));
+        fd->reset(socket(AF_VSOCK, SOCK_STREAM | SOCK_CLOEXEC, 0));
         if (fd->get() == -1) {
             *error = "could not open vsock socket";
             return false;
@@ -374,7 +374,7 @@
             errno = EINVAL;
             return -1;
         }
-        unique_fd serverfd(socket(AF_VSOCK, SOCK_STREAM, 0));
+        unique_fd serverfd(socket(AF_VSOCK, SOCK_STREAM | SOCK_CLOEXEC, 0));
         if (serverfd == -1) {
             int error_num = errno;
             *error = android::base::StringPrintf("could not create vsock server: '%s'",