From b429e6e15f7a5f90442bee23eb47864fe7f584e2 Mon Sep 17 00:00:00 2001
From: comex
Date: Sun, 12 Jul 2015 14:07:14 -0400
Subject: Important: Fix fd leak that I think was the culprit for substitute'd
 devices not accepting SSH connections after a while.

Jul 12 14:03:44 iPhone com.apple.xpc.launchd[1] (Listeners) <Error>:
assertion failed: 12F70: launchd + 34500
[C1C897D3-ECD1-3674-8B53-E0BCCDBCCEDE]: 0x9
Jul 12 14:03:44 iPhone com.apple.xpc.launchd[1] (com.openssh.sshd)
<Error>: Could not accept new inetd connection: 9: Bad file descriptor
---
 darwin-bootstrap/posixspawn-hook.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'darwin-bootstrap/posixspawn-hook.c')

diff --git a/darwin-bootstrap/posixspawn-hook.c b/darwin-bootstrap/posixspawn-hook.c
index 3c37403..7c339f1 100644
--- a/darwin-bootstrap/posixspawn-hook.c
+++ b/darwin-bootstrap/posixspawn-hook.c
@@ -80,6 +80,7 @@ static bool looks_restricted(const char *filename) {
         ib_log("open '%s': %s", filename, strerror(errno));
         return false;
     }
+    bool ret = false;
     uint32_t offset = 0;
     union {
         uint32_t magic;
@@ -91,18 +92,18 @@ static bool looks_restricted(const char *filename) {
     } u;
     if (read(fd, &u, sizeof(u)) != sizeof(u)) {
         ib_log("read header for '%s': %s", filename, strerror(errno));
-        return false;
+        goto end;
     }
     if (ntohl(u.magic) == FAT_MAGIC) {
         /* Fat binary - to avoid needing to replicate grade_binary in the
          * kernel, we assume all architectures have the same restrict-ness. */
          if (u.fh.nfat_arch == 0)
-            return false;
+            goto end;
         offset = ntohl(u.fa1.offset);
         if (pread(fd, &u, sizeof(u), offset) != sizeof(u)) {
             ib_log("read header (inside fat) for '%s': %s",
                    filename, strerror(errno));
-            return false;
+            goto end;
         }
     }
     bool swap, is64;
@@ -125,7 +126,7 @@ static bool looks_restricted(const char *filename) {
         break;
     default:
         ib_log("bad mach-o magic for '%s'", filename);
-        return false;
+        goto end;
     }
     uint32_t sizeofcmds = u.mh.sizeofcmds;
     if (swap)
@@ -136,12 +137,14 @@ static bool looks_restricted(const char *filename) {
     if (actual < 0 || (uint32_t) actual != sizeofcmds) {
         ib_log("read load cmds for '%s': %s", filename, strerror(errno));
         free(cmds_buf);
-        return false;
+        goto end;
     }
     /* overestimation is fine here */
     const char sectname[] = "__restrict";
-    bool ret = !!memmem(cmds_buf, sizeofcmds, sectname, sizeof(sectname));
+    ret = !!memmem(cmds_buf, sizeofcmds, sectname, sizeof(sectname));
     free(cmds_buf);
+end:
+    close(fd);
     return ret;
 }
 
-- 
cgit v1.2.3