RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:38:12 +00:00
Code Issues Activity Actions

ping: Avoid overflow for large interval values

Browse source 
Previously `usleep()` was being used, which takes a 32-bit integer
number of microseconds as a parameter. This caused an overflow for
intervals larger than 4294 seconds. We now use `clock_nanosleep()`
instead and ensure the user cannot specify a value larger than
`UINT32_MAX` seconds.
This commit is contained in:
Tim Ledbetter 2023-05-26 06:14:06 +01:00 • committed by Andreas Kling
parent 907e0b9e1d
commit 834dc3747c
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Utilities/ping.cpp
View file

@ -33,7 +33,7 @@ static int max_ms;
static DeprecatedString host; static DeprecatedString host;
static int payload_size = -1; static int payload_size = -1;
static bool quiet = false; static bool quiet = false;
static u64 interval_in_microseconds = 1'000'000; static timespec interval_timespec { .tv_sec = 1, .tv_nsec = 0 };
// variable part of header can be 0 to 40 bytes // variable part of header can be 0 to 40 bytes
// https://datatracker.ietf.org/doc/html/rfc791#section-3.1 // https://datatracker.ietf.org/doc/html/rfc791#section-3.1
static constexpr int max_optional_header_size_in_bytes = 40; static constexpr int max_optional_header_size_in_bytes = 40;
@ -78,10 +78,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return false; return false;
auto interval_in_seconds = interval_in_seconds_string.to_double(); auto interval_in_seconds = interval_in_seconds_string.to_double();
if (!interval_in_seconds.has_value() || interval_in_seconds.value() <= 0) if (!interval_in_seconds.has_value() || interval_in_seconds.value() <= 0 || interval_in_seconds.value() > UINT32_MAX)
return false; return false;
interval_in_microseconds = static_cast<u64>(interval_in_seconds.value() * 1'000'000); auto whole_seconds = static_cast<time_t>(interval_in_seconds.value());
auto fractional_seconds = interval_in_seconds.value() - static_cast<double>(whole_seconds);
interval_timespec = {
.tv_sec = whole_seconds,
.tv_nsec = static_cast<long>(fractional_seconds * 1'000'000'000)
};
return true; return true;
}, },
}); });
@ -234,6 +239,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
break; break;
} }
usleep(interval_in_microseconds); clock_nanosleep(CLOCK_MONOTONIC, 0, &interval_timespec, nullptr);
} }
} }