Changeset 23640

Timestamp:

06/04/08 14:57:47 (6 months ago)

Author:

zarzycki@…

Message:

Preparing to crank up the warning level...

Location:

trunk/launchd/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• launchctl.c (modified) (15 diffs)
• launchd.c (modified) (1 diff)
• launchd_core_logic.c (modified) (39 diffs)
• launchproxy.c (modified) (4 diffs)

trunk/launchd/src/Makefile.am

@@ -1 @@
-CWARN = -Wall -Wextra -Waggregate-return -Wfloat-equal -Wshadow -Wpacked -Wmissing-prototypes -Wmissing-declarations -Werror # gcc4.2: -Wstrict-overflow=4 # -Wpadded -Wconversion -Wstrict-aliasing=2
-CTUNE = -fvisibility=hidden -freorder-blocks # gcc4.2: -fdiagnostics-show-option # -fstrict-aliasing
-CMISC = -isysroot $(SDKROOT) -F$(SDKROOT)/System/Library/PrivateFrameworks -D__MigTypeCheck=1 -Dmig_external=__private_extern__ -D_DARWIN_USE_64_BIT_INODE=1
+CWARN = -Wall -Wextra -Waggregate-return -Wfloat-equal -Wshadow -Wpacked -Wmissing-prototypes -Wmissing-declarations -Werror -Wstrict-overflow=4 # -Wstrict-aliasing=2 -Wshorten-64-to-32 # -Wpadded -Wconversion
+CTUNE = -fvisibility=hidden -freorder-blocks -fdiagnostics-show-option # -fstrict-aliasing
+CMISC = -isysroot $(SDKROOT) -F$(SDKROOT)/System/Library/PrivateFrameworks -Dmig_external=__private_extern__ -D_DARWIN_USE_64_BIT_INODE=1
 AM_CFLAGS = $(CTUNE) $(CMISC) $(CWARN)
 AM_LDFLAGS = -Wl,-syslibroot,$(SDKROOT)

trunk/launchd/src/Makefile.in

@@ -243 +243 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-CWARN = -Wall -Wextra -Waggregate-return -Wfloat-equal -Wshadow -Wpacked -Wmissing-prototypes -Wmissing-declarations -Werror # gcc4.2: -Wstrict-overflow=4 # -Wpadded -Wconversion -Wstrict-aliasing=2
-CTUNE = -fvisibility=hidden -freorder-blocks # gcc4.2: -fdiagnostics-show-option # -fstrict-aliasing
-CMISC = -isysroot $(SDKROOT) -F$(SDKROOT)/System/Library/PrivateFrameworks -D__MigTypeCheck=1 -Dmig_external=__private_extern__ -D_DARWIN_USE_64_BIT_INODE=1
+CWARN = -Wall -Wextra -Waggregate-return -Wfloat-equal -Wshadow -Wpacked -Wmissing-prototypes -Wmissing-declarations -Werror -Wstrict-overflow=4 # -Wstrict-aliasing=2 -Wshorten-64-to-32 # -Wpadded -Wconversion
+CTUNE = -fvisibility=hidden -freorder-blocks -fdiagnostics-show-option # -fstrict-aliasing
+CMISC = -isysroot $(SDKROOT) -F$(SDKROOT)/System/Library/PrivateFrameworks -Dmig_external=__private_extern__ -D_DARWIN_USE_64_BIT_INODE=1
 AM_CFLAGS = $(CTUNE) $(CMISC) $(CWARN)
 AM_LDFLAGS = -Wl,-syslibroot,$(SDKROOT)

trunk/launchd/src/launchctl.c

@@ -97 +97 @@
         launch_data_t pass2;
         char *session_type;
-        unsigned int editondisk:1, load:1, forceload:1, __pad:29;
+        bool editondisk:1, load:1, forceload:1;
 };
 
@@ -320 +320 @@
         char s[1000], *c, *av[100];
         const char *file;
-        size_t len, i;
+        size_t len;
+        int i;
         FILE *f;
 
@@ -333 +334 @@
         }
 
-        while ((c = fgets(s, sizeof(s), f))) {
+        while ((c = fgets(s, (int) sizeof s, f))) {
                 len = strlen(c);
                 if (len && c[len - 1] == '\n') {
@@ -917 +918 @@
                         }
                         oldmask = umask(S_IRWXG|S_IRWXO);
-                        if (bind(sfd, (struct sockaddr *)&sun, sizeof(sun)) == -1) {
+                        if (bind(sfd, (struct sockaddr *)&sun, (socklen_t) sizeof sun) == -1) {
                                 close(sfd);
                                 umask(oldmask);
@@ -930 +931 @@
                                 return;
                         }
-                } else if (connect(sfd, (struct sockaddr *)&sun, sizeof(sun)) == -1) {
+                } else if (connect(sfd, (struct sockaddr *)&sun, (socklen_t) sizeof sun) == -1) {
                         close(sfd);
                         return;
@@ -1004 +1005 @@
                         if (hints.ai_flags & AI_PASSIVE) {
                                 if (AF_INET6 == res->ai_family && -1 == setsockopt(sfd, IPPROTO_IPV6, IPV6_V6ONLY,
-                                                        (void *)&sock_opt, sizeof(sock_opt))) {
+                                                        (void *)&sock_opt, (socklen_t) sizeof sock_opt)) {
                                         fprintf(stderr, "setsockopt(IPV6_V6ONLY): %m");
                                         return;
                                 }
                                 if (mgroup) {
-                                        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEPORT, (void *)&sock_opt, sizeof(sock_opt)) == -1) {
+                                        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEPORT, (void *)&sock_opt, (socklen_t) sizeof sock_opt) == -1) {
                                                 fprintf(stderr, "setsockopt(SO_REUSEPORT): %s\n", strerror(errno));
                                                 return;
                                         }
                                 } else {
-                                        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&sock_opt, sizeof(sock_opt)) == -1) {
+                                        if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&sock_opt, (socklen_t) sizeof sock_opt) == -1) {
                                                 fprintf(stderr, "setsockopt(SO_REUSEADDR): %s\n", strerror(errno));
                                                 return;
@@ -1109 +1110 @@
                         memset(&mreq, 0, sizeof(mreq));
                         mreq.imr_multiaddr = ((struct sockaddr_in *)res->ai_addr)->sin_addr;
-                        if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) == -1) {
+                        if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, (socklen_t) sizeof mreq) == -1) {
                                 fprintf(stderr, "setsockopt(IP_ADD_MEMBERSHIP): %s\n", strerror(errno));
                                 continue;
@@ -1117 +1118 @@
                         memset(&m6req, 0, sizeof(m6req));
                         m6req.ipv6mr_multiaddr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-                        if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &m6req, sizeof(m6req)) == -1) {
+                        if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &m6req, (socklen_t) sizeof m6req) == -1) {
                                 fprintf(stderr, "setsockopt(IPV6_JOIN_GROUP): %s\n", strerror(errno));
                                 continue;
@@ -1294 +1295 @@
 {
         FILE *where = stdout;
-        int l, cmdwidth = 0;
-        size_t i;
+        size_t i, l, cmdwidth = 0;
         
         if (argc == 0 || argv == NULL)
@@ -1304 +1304 @@
         for (i = 0; i < (sizeof cmds / sizeof cmds[0]); i++) {
                 l = strlen(cmds[i].name);
-                if (l > cmdwidth)
+                if (l > cmdwidth) {
                         cmdwidth = l;
+                }
         }
 
         for (i = 0; i < (sizeof cmds / sizeof cmds[0]); i++) {
-                fprintf(where, "\t%-*s\t%s\n", cmdwidth, cmds[i].name, cmds[i].desc);
+                fprintf(where, "\t%-*s\t%s\n", (int)cmdwidth, cmds[i].name, cmds[i].desc);
         }
 
@@ -2109 +2110 @@
 {
         int64_t inval, outval;
-        int i, j, m = 0;
         bool badargs = false, maskmode = false, onlymode = false, levelmode = false;
         static const struct {
@@ -2124 +2124 @@
                 { "emergency",  LOG_EMERG },
         };
-        int logtblsz = sizeof logtbl / sizeof logtbl[0];
+        size_t i, j, logtblsz = sizeof logtbl / sizeof logtbl[0];
+        int m = 0;
 
         if (argc >= 2) {
@@ -2141 +2142 @@
 
         if (argc > 2 && (maskmode || onlymode)) {
-                for (i = 2; i < argc; i++) {
+                for (i = 2; i < (size_t)argc; i++) {
                         for (j = 0; j < logtblsz; j++) {
                                 if (!strcmp(argv[i], logtbl[j].name)) {
@@ -2306 +2307 @@
                                 if (argc == 2 && (size_t)which != i)
                                         continue;
-                                fprintf(stdout, "\t%-12s%-15s%-15s\n", num2name(i),
+                                fprintf(stdout, "\t%-12s%-15s%-15s\n", num2name((int)i),
                                                 lim2str(lmts[i].rlim_cur, slimstr),
                                                 lim2str(lmts[i].rlim_max, hlimstr));
@@ -3115 +3116 @@
         if (assumes(prog != NULL)) {
                 /* The networking team has asked us to ignore the failure of this API if errno == ENOPROTOOPT */
-                assumes(setsockopt(sfd, SOL_SOCKET, SO_EXECPATH, prog, strlen(prog) + 1) != -1 || errno == ENOPROTOOPT);
+                assumes(setsockopt(sfd, SOL_SOCKET, SO_EXECPATH, prog, (socklen_t)(strlen(prog) + 1)) != -1 || errno == ENOPROTOOPT);
         }
 }

trunk/launchd/src/launchd.c

@@ -399 +399 @@
         char buf[1024];
 
-        launchd_assumes(read(kev->ident, &buf, sizeof(buf)) != -1);
+        launchd_assumes(read((int)kev->ident, &buf, sizeof(buf)) != -1);
 
         new_networking_state = get_network_state();

trunk/launchd/src/launchd_core_logic.c

@@ -189 +189 @@
 };
 
-static bool socketgroup_new(job_t j, const char *name, int *fds, unsigned int fd_cnt, bool junkfds);
+static bool socketgroup_new(job_t j, const char *name, int *fds, size_t fd_cnt, bool junkfds);
 static void socketgroup_delete(job_t j, struct socketgroup *sg);
 static void socketgroup_watch(job_t j, struct socketgroup *sg);
@@ -358 +358 @@
         uid_t mach_uid;
         jobmgr_t mgr;
+        size_t argc;
         char **argv;
         char *prog;
@@ -380 +381 @@
 #endif
         pid_t p;
-        int argc;
         int last_exit_status;
         int stdin_fd;
@@ -386 +386 @@
         int log_redirect_fd;
         int nice;
-        unsigned int timeout;
-        unsigned int exit_timeout;
         int stdout_err_fd;
+        uint32_t timeout;
+        uint32_t exit_timeout;
         uint64_t sent_signal_time;
         uint64_t start_time;
@@ -712 +712 @@
         }
         if (likely(j->argv) && (tmp = launch_data_alloc(LAUNCH_DATA_ARRAY))) {
-                int i;
+                size_t i;
 
                 for (i = 0; i < j->argc; i++) {
@@ -1070 +1070 @@
         launch_data_t tmp_oai;
         job_t j = context;
-        unsigned int i, fd_cnt = 1;
+        size_t i, fd_cnt = 1;
         int *fds;
 
@@ -1126 +1126 @@
 
         /* Sigh... at the moment, MIG has maxsize == sizeof(reply union) */
-        mxmsgsz = sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
+        mxmsgsz = (typeof(mxmsgsz)) sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
         if (job_mig_protocol_vproc_subsystem.maxsize > mxmsgsz) {
                 mxmsgsz = job_mig_protocol_vproc_subsystem.maxsize;
@@ -1327 +1327 @@
         char *co;
         size_t minlabel_len;
-        int i, cc = 0;
+        size_t i, cc = 0;
         job_t j;
 
@@ -1707 +1707 @@
                                 job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT);
                         } else {
-                                j->exit_timeout = value;
+                                j->exit_timeout = (typeof(j->exit_timeout)) value;
                         }
                 }
@@ -1714 +1714 @@
         case 'N':
                 if (strcasecmp(key, LAUNCH_JOBKEY_NICE) == 0) {
-                        j->nice = value;
-                        j->setnice = true;
+                        if (unlikely(value < PRIO_MIN)) {
+                                job_log(j, LOG_WARNING, "%s less than %d. Ignoring.", LAUNCH_JOBKEY_NICE, PRIO_MIN);
+                        } else if (unlikely(value > PRIO_MAX)) {
+                                job_log(j, LOG_WARNING, "%s is greater than %d. Ignoring.", LAUNCH_JOBKEY_NICE, PRIO_MAX);
+                        } else {
+                                j->nice = (typeof(j->nice)) value;
+                                j->setnice = true;
+                        }
                 }
                 break;
@@ -1726 +1732 @@
                                 job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_TIMEOUT);
                         } else {
-                                j->timeout = value;
+                                j->timeout = (typeof(j->timeout)) value;
                         }
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_THROTTLEINTERVAL) == 0) {
@@ -1734 +1740 @@
                                 job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_THROTTLEINTERVAL);
                         } else {
-                                j->min_run_time = value;
+                                j->min_run_time = (typeof(j->min_run_time)) value;
                         }
                 }
@@ -1754 +1760 @@
                         } else {
                                 runtime_add_weak_ref();
-                                j->start_interval = value;
-
-                                job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j) != -1);
+                                j->start_interval = (typeof(j->start_interval)) value;
+
+                                job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, j->start_interval, j) != -1);
                         }
 #if HAVE_SANDBOX
@@ -1949 +1955 @@
                                 j->j_binpref_cnt = value_cnt;
                                 for (i = 0; i < value_cnt; i++) {
-                                        j->j_binpref[i] = launch_data_get_integer(launch_data_array_get_index(value, i));
+                                        j->j_binpref[i] = (cpu_type_t) launch_data_get_integer(launch_data_array_get_index(value, i));
                                 }
                         }
@@ -2322 +2328 @@
 
         if (unlikely(j->weird_bootstrap)) {
-                mach_msg_size_t mxmsgsz = sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
+                mach_msg_size_t mxmsgsz = (typeof(mxmsgsz)) sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
 
                 if (job_mig_protocol_vproc_subsystem.maxsize > mxmsgsz) {
@@ -2600 +2606 @@
         int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
 #endif
-        int mib_sz = sizeof(mib) / sizeof(mib[0]);
+        size_t mib_sz = sizeof(mib) / sizeof(mib[0]);
         size_t i, kp_cnt, len = sizeof(struct kinfo_proc) * get_kern_max_proc();
         struct kinfo_proc *kp;
@@ -2611 +2617 @@
                 return;
         }
-        if (!job_assumes(j, sysctl(mib, mib_sz, kp, &len, NULL, 0) != -1)) {
+        if (!job_assumes(j, sysctl(mib, (u_int) mib_sz, kp, &len, NULL, 0) != -1)) {
                 goto out;
         }
@@ -2761 +2767 @@
         }
 
-        if ((j = jobmgr_find_by_pid(jm, kev->ident, false))) {
+        if ((j = jobmgr_find_by_pid(jm, (pid_t) kev->ident, false))) {
                 kev->udata = j;
                 job_callback(j, kev);
@@ -2836 +2842 @@
                 return job_callback_proc(j, kev->fflags);
         case EVFILT_TIMER:
-                return job_callback_timer(j, (void *)kev->ident);
+                return job_callback_timer(j, (void *) kev->ident);
         case EVFILT_VNODE:
                 return semaphoreitem_callback(j, kev);
         case EVFILT_READ:
-                return job_callback_read(j, kev->ident);
+                return job_callback_read(j, (int) kev->ident);
         case EVFILT_MACHPORT:
                 return (void)job_dispatch(j, true);
@@ -3015 +3021 @@
         short spflags = POSIX_SPAWN_SETEXEC;
         size_t binpref_out_cnt = 0;
-        int i;
+        size_t i;
 
         if (JOB_BOOTCACHE_HACK_CHECK(j)) {
@@ -3886 +3892 @@
 }
 
+struct cal_dict_walk {
+        job_t j;
+        struct tm tmptm;
+};
+
 void
 calendarinterval_new_from_obj_dict_walk(launch_data_t obj, const char *key, void *context)
 {
-        struct tm *tmptm = context;
+        struct cal_dict_walk *cdw = context;
+        struct tm *tmptm = &cdw->tmptm;
+        job_t j = cdw->j;
         int64_t val;
 
@@ -3900 +3913 @@
         val = launch_data_get_integer(obj);
 
-        if (strcasecmp(key, LAUNCH_JOBKEY_CAL_MINUTE) == 0) {
-                tmptm->tm_min = val;
+        if (val < 0) {
+                job_log(j, LOG_WARNING, "The interval for key \"%s\" is less than zero.", key);
+        } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_MINUTE) == 0) {
+                tmptm->tm_min = (typeof(tmptm->tm_min)) val;
         } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_HOUR) == 0) {
-                tmptm->tm_hour = val;
+                tmptm->tm_hour = (typeof(tmptm->tm_hour)) val;
         } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_DAY) == 0) {
-                tmptm->tm_mday = val;
+                tmptm->tm_mday = (typeof(tmptm->tm_mday)) val;
         } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_WEEKDAY) == 0) {
-                tmptm->tm_wday = val;
+                tmptm->tm_wday = (typeof(tmptm->tm_wday)) val;
         } else if (strcasecmp(key, LAUNCH_JOBKEY_CAL_MONTH) == 0) {
-                tmptm->tm_mon = val;
+                tmptm->tm_mon = (typeof(tmptm->tm_mon)) val;
                 tmptm->tm_mon -= 1; /* 4798263 cron compatibility */
         }
@@ -3917 +3932 @@
 calendarinterval_new_from_obj(job_t j, launch_data_t obj)
 {
-        struct tm tmptm;
-
-        memset(&tmptm, 0, sizeof(0));
-
-        tmptm.tm_min = -1;
-        tmptm.tm_hour = -1;
-        tmptm.tm_mday = -1;
-        tmptm.tm_wday = -1;
-        tmptm.tm_mon = -1;
+        struct cal_dict_walk cdw;
+
+        cdw.j = j;
+        memset(&cdw.tmptm, 0, sizeof(0));
+
+        cdw.tmptm.tm_min = -1;
+        cdw.tmptm.tm_hour = -1;
+        cdw.tmptm.tm_mday = -1;
+        cdw.tmptm.tm_wday = -1;
+        cdw.tmptm.tm_mon = -1;
 
         if (!job_assumes(j, obj != NULL)) {
@@ -3935 +3951 @@
         }
 
-        launch_data_dict_iterate(obj, calendarinterval_new_from_obj_dict_walk, &tmptm);
-
-        if (unlikely(tmptm.tm_sec == -1)) {
+        launch_data_dict_iterate(obj, calendarinterval_new_from_obj_dict_walk, &cdw);
+
+        if (unlikely(cdw.tmptm.tm_sec == -1)) {
                 return false;
         }
 
-        return calendarinterval_new(j, &tmptm);
+        return calendarinterval_new(j, &cdw.tmptm);
 }
 
@@ -4009 +4025 @@
 
 bool
-socketgroup_new(job_t j, const char *name, int *fds, unsigned int fd_cnt, bool junkfds)
+socketgroup_new(job_t j, const char *name, int *fds, size_t fd_cnt, bool junkfds)
 {
         struct socketgroup *sg = calloc(1, sizeof(struct socketgroup) + strlen(name) + 1);
@@ -4087 +4103 @@
         for (i = 0; i < sg->fd_cnt; i++) {
                 job_assumes(j, kev[i].flags & EV_ERROR);
-                errno = kev[i].data;
+                errno = (typeof(errno)) kev[i].data;
                 job_assumes(j, kev[i].data == 0);
         }
@@ -4231 +4247 @@
 {
         job_t j = context;
-        int i, limits_cnt = (sizeof(launchd_keys2limits) / sizeof(launchd_keys2limits[0]));
+        size_t i, limits_cnt = (sizeof(launchd_keys2limits) / sizeof(launchd_keys2limits[0]));
         rlim_t rl;
 
@@ -4582 +4598 @@
         switch (launch_data_get_type(obj)) {
         case LAUNCH_DATA_INTEGER:
-                which_port = launch_data_get_integer(obj);
+                which_port = (int)launch_data_get_integer(obj); /* XXX we should bound check this... */
                 if (strcasecmp(key, LAUNCH_JOBKEY_MACH_TASKSPECIALPORT) == 0) {
                         switch (which_port) {
@@ -4589 +4605 @@
                         case TASK_NAME_PORT:
                         case TASK_BOOTSTRAP_PORT:
-                        /* I find it a little odd that zero isn't reserved in the header */
+                        /* I find it a little odd that zero isn't reserved in the header.
+                         * Normally Mach is fairly good about this convention... */
                         case 0:
                                 job_log(ms->job, LOG_WARNING, "Tried to set a reserved task special port: %d", which_port);
@@ -4886 +4903 @@
 
                 if (trusted_fd) {
-                        int dfd, lfd = strtol(trusted_fd, NULL, 10);
+                        int dfd, lfd = (int) strtol(trusted_fd, NULL, 10);
 
                         if ((dfd = dup(lfd)) >= 0) {
@@ -4912 +4929 @@
 
         /* Sigh... at the moment, MIG has maxsize == sizeof(reply union) */
-        mxmsgsz = sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
+        mxmsgsz = (typeof(mxmsgsz)) sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
         if (job_mig_protocol_vproc_subsystem.maxsize > mxmsgsz) {
                 mxmsgsz = job_mig_protocol_vproc_subsystem.maxsize;
@@ -5246 +5263 @@
         char *sample_args[] = { "sample", pidstr, "1", "-unsupportedShowArch", "-mayDie", "-file", logfile, NULL };
         char *contents = NULL;
+        size_t contents_sz;
         int logfile_fd = -1;
         int console_fd = -1;
@@ -5309 +5327 @@
         }
 
-        contents = malloc(sb.st_size);
+        if (sizeof (size_t) == 4 && !job_assumes(j, !(sb.st_size & 0xffffffff00000000llu))) {
+                goto out;
+        }
+
+        contents_sz = (size_t) sb.st_size;
+
+        contents = malloc(contents_sz);
 
         if (!job_assumes(j, contents != NULL)) {
@@ -5315 +5339 @@
         }
 
-        if (!job_assumes(j, read(logfile_fd, contents, sb.st_size) == sb.st_size)) {
+        if (!job_assumes(j, read(logfile_fd, contents, contents_sz) == (ssize_t) contents_sz)) {
                 goto out;
         }
 
-        job_assumes(j, write(console_fd, contents, sb.st_size) == sb.st_size);
+        job_assumes(j, write(console_fd, contents, contents_sz) == (ssize_t) contents_sz);
 
 out: