Skip to content

avoid crash/assert on periodic events with too large a random spread #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hmh wants to merge 3 commits into
base: master
Choose a base branch
from
Open

avoid crash/assert on periodic events with too large a random spread #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3702304
lmapd: protect against event_free(NULL)
hmh Jan 5, 2021
a5677c7
lmapd: do not abort due to too large a random spread
hmh Jan 4, 2021
1ba1643
lmapd: refuse too large random spreads for periodic events
hmh Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions src/data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,13 +1162,21 @@ lmap_event_valid(struct lmap *lmap, struct event *event)
valid = 0;
}

if (event->type == LMAP_EVENT_TYPE_PERIODIC
&& ! (event->flags & LMAP_EVENT_FLAG_INTERVAL_SET)) {
lmap_err("event %s%s%srequires an interval",
event->name ? "'" : "",
event->name ? event->name : "",
event->name ? "' " : "");
valid = 0;
if (event->type == LMAP_EVENT_TYPE_PERIODIC) {
if (!(event->flags & LMAP_EVENT_FLAG_INTERVAL_SET)) {
lmap_err("event %s%s%srequires an interval",
event->name ? "'" : "",
event->name ? event->name : "",
event->name ? "' " : "");
valid = 0;
} else if (event->flags & LMAP_EVENT_FLAG_RANDOM_SPREAD_SET
&& event->random_spread >= event->interval) {
lmap_err("event %s%s%shas a random spread too large for its interval",
event->name ? "'" : "",
event->name ? event->name : "",
event->name ? "' " : "");
valid = 0;
}
}
if (event->type == LMAP_EVENT_TYPE_CALENDAR) {
if (event->months == 0) {
Expand Down
31 changes: 22 additions & 9 deletions src/runner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,28 @@ static void
event_gaga(struct event *event, struct event **ev,
short what, event_callback_fn func, struct timeval *tv)
{
assert(event && event->lmapd && ev && *ev == NULL);
assert(event && event->lmapd && ev);

*ev = event_new(event->lmapd->base, -1, what, func, event);
if (!*ev || event_add(*ev, tv) < 0) {
lmap_err("failed to create/add event for '%s'", event->name);
if (!(*ev)) {
*ev = event_new(event->lmapd->base, -1, what, func, event);
if (!*ev || event_add(*ev, tv) < 0) {
lmap_err("failed to create/add event for '%s'", event->name);
}
} else {
lmap_err("failed to create/add event for '%s': event already pending, maybe due to too large a random spread?", event->name);
}
}
#endif

static void
safe_event_free(struct event * event)
{
if (event)
event_free(event);
else
lmap_wrn("internal error: tried to free an event twice");
}

/**
* @brief Generate a uniformly distributed random number.
*
Expand Down Expand Up @@ -787,7 +800,7 @@ fire_cb(evutil_socket_t fd, short events, void *context)
suppress_cb(event->lmapd, event);
execute_cb(event->lmapd, event);

event_free(event->fire_event);
safe_event_free(event->fire_event);
event->fire_event = NULL;
}

Expand All @@ -808,7 +821,7 @@ trigger_periodic_cb(evutil_socket_t fd, short events, void *context)
if (t.tv_sec > event->end) {
/* XXX disable related schedules / suppressions */
lmap_wrn("event '%s' ending", event->name);
event_free(event->trigger_event);
safe_event_free(event->trigger_event);
event->trigger_event = NULL;
return;
}
Expand Down Expand Up @@ -836,7 +849,7 @@ trigger_calendar_cb(evutil_socket_t fd, short events, void *context)
if (t.tv_sec > event->end) {
/* XXX disable related schedules / suppressions */
lmap_wrn("event '%s' ending", event->name);
event_free(event->trigger_event);
safe_event_free(event->trigger_event);
event->trigger_event = NULL;
return;
}
Expand All @@ -845,7 +858,7 @@ trigger_calendar_cb(evutil_socket_t fd, short events, void *context)
match = lmap_event_calendar_match(event, &t.tv_sec);
if (match < 0) {
lmap_err("shutting down '%s'", event->name);
event_free(event->trigger_event);
safe_event_free(event->trigger_event);
event->trigger_event = NULL;
return;
}
Expand Down Expand Up @@ -885,7 +898,7 @@ startup_cb(evutil_socket_t fd, short events, void *context)
break;
}

event_free(event->start_event);
safe_event_free(event->start_event);
event->start_event = NULL;
}

Expand Down