From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 23 Oct 2018 13:23:34 +0000 (+0900)
Subject: util: check overflow in parse_time()
X-Git-Tag: v240~491^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8079c90333422bbc008b68a9b7cefbdb8a15a4e9;p=thirdparty%2Fsystemd.git

util: check overflow in parse_time()
---

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 9115c3bf272..e24eef4082b 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1048,12 +1048,21 @@ int parse_time(const char *t, usec_t *usec, usec_t default_unit) {
 
                 something = true;
 
+
+                k = ((usec_t) -1) / multiplier;
+                if ((usec_t) l + 1 >= k || (usec_t) z >= k)
+                        return -ERANGE;
+
                 k = (usec_t) z * multiplier;
 
                 for (; n > 0; n--)
                         k /= 10;
 
-                r += (usec_t) l * multiplier + k;
+                k += (usec_t) l * multiplier;
+                if (k >= ((usec_t) -1) - r)
+                        return -ERANGE;
+
+                r += k;
         }
 
         *usec = r;