commit 60bce378cfa29463f57756fc724d1572747f4fc5
author Maciej Żenczykowski <maze@google.com> Tue Apr 09 01:58:52 2019 -0700
committer Maciej Żenczykowski <maze@google.com> Wed Apr 10 01:17:47 2019 -0700
tree d326aaffc6a78cbff16b31e55deab37a1caf57ca
parent 4e1601e533b4b34d38e4eed229180257a385181b

Fix some clatd cloexec and file descriptor leaking via missing close()

Not terribly important since clatd doesn't exec anything,
but was muddying the waters while I was searching for other
fd-survives-across-exec leakage in netd.  While at it also
fix another leaked fd which we forgot to close().

Test: builds and boots

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iceb7d4052dc9be29db5c7bb3fe2ee27da7864379

ring.c

diff --git a/ring.c b/ring.c
index 61d40d2..e836a55 100644
--- a/ring.c
+++ b/ring.c
@@ -30,7 +30,7 @@
 #include "tun.h"
 
 int ring_create(struct tun_data *tunnel) {
-  int packetsock = socket(AF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
+  int packetsock = socket(AF_PACKET, SOCK_DGRAM | SOCK_CLOEXEC, htons(ETH_P_IPV6));
   if (packetsock < 0) {
     logmsg(ANDROID_LOG_FATAL, "packet socket failed: %s", strerror(errno));
     return -1;