34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
commit 9a312e3cd914da2b6f32651c94d1d1d4fb0bf359
|
||
|
|
Author: Jiri Popelka <jpopelka@redhat.com>
|
||
|
|
Date: Fri Jul 27 10:00:49 2012 +0200
|
||
|
|
|
||
|
|
isc_time_nowplusinterval() is not safe with 64-bit time_t (#662254, #789601)
|
||
|
|
|
||
|
|
References: bsc#947780
|
||
|
|
Index: dhcp-4.2.4-P2/common/dispatch.c
|
||
|
|
===================================================================
|
||
|
|
--- dhcp-4.2.4-P2.orig/common/dispatch.c
|
||
|
|
+++ dhcp-4.2.4-P2/common/dispatch.c
|
||
|
|
@@ -320,7 +320,20 @@ void add_timeout (when, where, what, ref
|
||
|
|
q->next = timeouts;
|
||
|
|
timeouts = q;
|
||
|
|
|
||
|
|
- isc_interval_set(&interval, sec & DHCP_SEC_MAX, usec * 1000);
|
||
|
|
+ /* isc_time_nowplusinterval() is not safe with 64-bit time_t and will
|
||
|
|
+ * return an error for sufficiently large intervals. We have to limit
|
||
|
|
+ * the interval to INT_MAX or less to ensure the interval doesn't
|
||
|
|
+ * overflow 32 bits, since the returned isc_time_t fields are
|
||
|
|
+ * 32-bit unsigned ints.
|
||
|
|
+ *
|
||
|
|
+ * HACK: The 9 is a magic number of seconds, since some time may have
|
||
|
|
+ * gone by since the last call to gettimeofday() and the one in
|
||
|
|
+ * isc_time_nowplusinterval().
|
||
|
|
+ */
|
||
|
|
+ if (sec > TIME_MAX)
|
||
|
|
+ sec = TIME_MAX - 9;
|
||
|
|
+
|
||
|
|
+ isc_interval_set(&interval, sec, usec * 1000);
|
||
|
|
status = isc_time_nowplusinterval(&expires, &interval);
|
||
|
|
if (status != ISC_R_SUCCESS) {
|
||
|
|
/*
|