From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 11 Jul 2017 17:12:48 +0000 (+0900)
Subject: time-util: make parse_timestamp() return -EINVAL if the input is very old date (... 
X-Git-Tag: chiark/234.4-1+devuan1.1+iwj1~69
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d301fa1cd7502f2b460905fc97e19ed7fa2172c2;p=elogind.git

time-util: make parse_timestamp() return -EINVAL if the input is very old date (#6327)

This reverts 7635ab8e74ea4a94e81143c3077570a986df375c and makes parse_timestamp()
return -EINVAL if the input is older than 1970-01-01.

Fixes #6290.
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 397637f53..be0197f44 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -247,7 +247,7 @@ usec_t timeval_load(const struct timeval *tv) {
 struct timeval *timeval_store(struct timeval *tv, usec_t u) {
         assert(tv);
 
-        if (u == USEC_INFINITY||
+        if (u == USEC_INFINITY ||
             u / USEC_PER_SEC > TIME_T_MAX) {
                 tv->tv_sec = (time_t) -1;
                 tv->tv_usec = (suseconds_t) -1;
@@ -860,31 +860,27 @@ parse_usec:
 
 from_tm:
         x = mktime_or_timegm(&tm, utc);
-        if (x == (time_t) -1)
-                return -EOVERFLOW;
+        if (x < 0)
+                return -EINVAL;
 
         if (weekday >= 0 && tm.tm_wday != weekday)
                 return -EINVAL;
 
-        if (x < 0)
-                ret = 0;
-        else
-                ret = (usec_t) x * USEC_PER_SEC + x_usec;
-
+        ret = (usec_t) x * USEC_PER_SEC + x_usec;
         if (ret > USEC_TIMESTAMP_FORMATTABLE_MAX)
                 return -EINVAL;
 
 finish:
         if (ret + plus < ret) /* overflow? */
-                return -EOVERFLOW;
+                return -EINVAL;
         ret += plus;
         if (ret > USEC_TIMESTAMP_FORMATTABLE_MAX)
                 return -EINVAL;
 
-        if (ret > minus)
+        if (ret >= minus)
                 ret -= minus;
         else
-                ret = 0;
+                return -EINVAL;
 
         *usec = ret;