hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-24 09:13:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

dhclient: Use clock_gettime() instead of time()

Browse Source 
Change the use of time() to clock_gettime() to have millisecond-accurate
rather than second-accurate timeouts.

Sponsored by:	Google LLC (GSoC 2024)
Signed-off-by:	Isaac Cilia Attard <icattard@FreeBSD.org>
MFC after:	10 days
Reviwed by:	cperciva, brooks, Tom Hukins, Alexander Ziaee
Pull Request:	https://github.com/freebsd/freebsd-src/pull/1368
This commit is contained in:
Isaac Cilia Attard 2024-07-08 08:23:00 +02:00 committed by Colin Percival
parent 76e0ffd9f8
commit f0a38976b0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/dhclient/dhclient.c
View File

@ -446,7 +446,8 @@ main(int argc, char *argv[])
log_perror = 0;
tzset();
time(&cur_time);
clock_gettime(CLOCK_MONOTONIC, &time_now);
cur_time = time_now.tv_sec;
inaddr_broadcast.s_addr = INADDR_BROADCAST;
inaddr_any.s_addr = INADDR_ANY;

18
sbin/dhclient/dispatch.c
View File

@ -56,6 +56,10 @@
#define assert_aligned(p, align) assert((((uintptr_t)p) & ((align) - 1)) == 0)
static struct protocol *protocols;
static const struct timespec timespec_intmax_ms = {
.tv_sec = INT_MAX / 1000,
.tv_nsec = (INT_MAX % 1000) * 1000000
};
static struct timeout *timeouts;
static struct timeout *free_timeouts;
static int interfaces_invalidated;
@ -190,9 +194,9 @@ another:
* negative timeout and blocking indefinitely.
*/
timespecsub(&timeouts->when, &time_now, &howlong);
if (howlong.tv_sec > INT_MAX / 1000)
howlong.tv_sec = INT_MAX / 1000;
to_msec = howlong.tv_sec * 1000;
if (timespeccmp(&howlong, &timespec_intmax_ms, >))
howlong = timespec_intmax_ms;
to_msec = howlong.tv_sec * 1000 + howlong.tv_nsec / 1000000;
} else
to_msec = -1;
@ -219,16 +223,16 @@ another:
/* Not likely to be transitory... */
if (count == -1) {
if (errno == EAGAIN || errno == EINTR) {
time(&cur_time);
time_now.tv_sec = cur_time;
clock_gettime(CLOCK_MONOTONIC, &time_now);
cur_time = time_now.tv_sec;
continue;
} else
error("poll: %m");
}
/* Get the current time... */
time(&cur_time);
time_now.tv_sec = cur_time;
clock_gettime(CLOCK_MONOTONIC, &time_now);
cur_time = time_now.tv_sec;
i = 0;
for (l = protocols; l; l = l->next) {