commit c8be2d2c9992d4b04ea36356e47cc9db0b36d900
author Maciej Żenczykowski <maze@google.com> Mon May 02 06:24:51 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 02 06:24:51 2022 +0000
tree 0aff1cc908e04ede881ba0ca0d92f412e55d8c9f
parent e1dfbe0cfa646b5c7a1f2355ac0da8187abf9a88
parent 6595c95e1a9de0424385df0fbb3986629868efd3

Merge "[CLATJ#28] ClatCoordinator: spawn clatd with flag POSIX_SPAWN_CLOEXEC_DEFAULT" into tm-dev

service/jni/com_android_server_connectivity_ClatCoordinator.cpp

diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index 500c696..ba836b2 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -314,7 +314,11 @@
     }
 
     // TODO: use android::base::ScopeGuard.
-    if (int ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_USEVFORK)) {
+    if (int ret = posix_spawnattr_setflags(&attr, POSIX_SPAWN_USEVFORK
+#ifdef POSIX_SPAWN_CLOEXEC_DEFAULT
+                                           | POSIX_SPAWN_CLOEXEC_DEFAULT
+#endif
+                                           )) {
         posix_spawnattr_destroy(&attr);
         throwIOException(env, "posix_spawnattr_setflags failed", ret);
         return -1;