Merge "set O_CLOEXEC on /dev/tun open"

2018-11-01 23:52:27 +00:00
parent cc690e9a48 3889888278
commit 68fd19b04c
1 changed files with 1 additions and 1 deletions
--- a/services/core/jni/com_android_server_connectivity_Vpn.cpp
+++ b/services/core/jni/com_android_server_connectivity_Vpn.cpp
@@ -57,7 +57,7 @@ static inline in_addr_t *as_in_addr(sockaddr *sa) {

 static int create_interface(int mtu)
 {
-    int tun = open("/dev/tun", O_RDWR | O_NONBLOCK);
+    int tun = open("/dev/tun", O_RDWR | O_NONBLOCK | O_CLOEXEC);

    ifreq ifr4;
    memset(&ifr4, 0, sizeof(ifr4));