<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23389] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23389">23389</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-14 13:59:58 -0700 (Fri, 14 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better bounds checking.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23388 => 23389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-09-14 20:25:43 UTC (rev 23388)
+++ trunk/launchd/src/launchd_core_logic.c 2007-09-14 20:59:58 UTC (rev 23389)
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> uint64_t sent_sigterm_time;
</span><span class="cx"> uint64_t start_time;
</span><span class="cx"> uint32_t min_run_time;
</span><del>- unsigned int start_interval;
</del><ins>+ uint32_t start_interval;
</ins><span class="cx"> unsigned int checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1,
</span><span class="cx"> ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1,
</span><span class="cx"> importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, start_pending:1;
</span><span class="lines">@@ -1418,7 +1418,9 @@
</span><span class="cx"> case 'E':
</span><span class="cx"> if (strcasecmp(key, LAUNCH_JOBKEY_EXITTIMEOUT) == 0) {
</span><span class="cx"> if (value < 0) {
</span><del>- job_log(j, LOG_WARNING, "Exit timeout less zero. Ignoring.");
</del><ins>+ job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT);
+ } else if (value > UINT32_MAX) {
+ job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT);
</ins><span class="cx"> } else {
</span><span class="cx"> j->exit_timeout = value;
</span><span class="cx"> }
</span><span class="lines">@@ -1434,14 +1436,18 @@
</span><span class="cx"> case 't':
</span><span class="cx"> case 'T':
</span><span class="cx"> if (strcasecmp(key, LAUNCH_JOBKEY_TIMEOUT) == 0) {
</span><del>- if (value <= 0) {
- job_log(j, LOG_WARNING, "Timeout less than or equal to zero. Ignoring.");
</del><ins>+ if (value < 0) {
+ job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_TIMEOUT);
+ } else if (value > UINT32_MAX) {
+ job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_TIMEOUT);
</ins><span class="cx"> } else {
</span><span class="cx"> j->timeout = value;
</span><span class="cx"> }
</span><span class="cx"> } else if (strcasecmp(key, LAUNCH_JOBKEY_THROTTLEINTERVAL) == 0) {
</span><span class="cx"> if (value < 0) {
</span><span class="cx"> job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_THROTTLEINTERVAL);
</span><ins>+ } else if (value > UINT32_MAX) {
+ job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_THROTTLEINTERVAL);
</ins><span class="cx"> } else {
</span><span class="cx"> j->min_run_time = value;
</span><span class="cx"> }
</span><span class="lines">@@ -1458,14 +1464,15 @@
</span><span class="cx"> case 'S':
</span><span class="cx"> if (strcasecmp(key, LAUNCH_JOBKEY_STARTINTERVAL) == 0) {
</span><span class="cx"> if (value <= 0) {
</span><del>- job_log(j, LOG_WARNING, "StartInterval is not greater than zero, ignoring");
</del><ins>+ job_log(j, LOG_WARNING, "%s is not greater than zero. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL);
+ } else if (value > UINT32_MAX) {
+ job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL);
</ins><span class="cx"> } else {
</span><span class="cx"> runtime_add_ref();
</span><span class="cx"> j->start_interval = value;
</span><ins>+
+ job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j) != -1);
</ins><span class="cx"> }
</span><del>- if (-1 == kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j)) {
- job_log_error(j, LOG_ERR, "adding kevent timer");
- }
</del><span class="cx"> } else if (strcasecmp(key, LAUNCH_JOBKEY_SANDBOXFLAGS) == 0) {
</span><span class="cx"> j->seatbelt_flags = value;
</span><span class="cx"> }
</span><span class="lines">@@ -5192,7 +5199,9 @@
</span><span class="cx"> j->ondemand = !inval;
</span><span class="cx"> break;
</span><span class="cx"> case VPROC_GSK_START_INTERVAL:
</span><del>- if ((unsigned int)inval > 0) {
</del><ins>+ if ((uint64_t)inval > UINT32_MAX) {
+ kr = 1;
+ } else if (inval) {
</ins><span class="cx"> if (j->start_interval == 0) {
</span><span class="cx"> runtime_add_ref();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>