summaryrefslogtreecommitdiff
path: root/src/shared/util.c
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-10-29 15:49:34 -0400
committerDave Reisner <dreisner@archlinux.org>2012-10-29 15:53:03 -0400
commit49371bb50e0fe6e9e90309a20006bcfd9e2fa8f4 (patch)
treec1d9225bb22ce0b683273147381d9e84d01a6980 /src/shared/util.c
parent6827101ab4df4730a22062f4b3a8f8c2bae5be28 (diff)
util: avoid divide by zero FPE
In early userspace, if kernel initialization happens extremely quickly, a call to systemd-timestamp can potentially result in division by zero. Ensure that the check in timespec_load, which only makes sense if tv_sec is greater than zero, is guarded by this condition.
Diffstat (limited to 'src/shared/util.c')
-rw-r--r--src/shared/util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index e2f8b1fb78..9a45e6058e 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -148,7 +148,8 @@ usec_t timespec_load(const struct timespec *ts) {
ts->tv_nsec == (long) -1)
return (usec_t) -1;
- if (USEC_PER_SEC > ((UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / (usec_t) ts->tv_sec))
+ if (ts->tv_sec > 0 &&
+ USEC_PER_SEC > ((UINT64_MAX - (ts->tv_nsec / NSEC_PER_USEC)) / (usec_t) ts->tv_sec))
return (usec_t) -1;
return