mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

Fix potential signed integer overflow on 32-bit CPUs.

Browse Source 
Converting fractional minutes to nanoseconds could overflow a 32-bit
integer, use long long instead.
This commit is contained in:
Todd C. Miller
2022-05-27 15:47:32 -06:00
parent 93916fde4f
commit dc8311dae9
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/sudoers/defaults.c
View File

@@ -935,38 +935,38 @@ store_timespec(const char *str, struct sudo_defs_types *def)
sudo_timespecclear(&ts);
if (str != NULL) {
/* Convert from minutes to timespec. */
/* Convert from minutes to seconds. */
if (*str == '+' || *str == '-')
sign = *str++;
while (*str != '\0' && *str != '.') {
if (!isdigit((unsigned char)*str))
debug_return_bool(false); /* invalid number */
/* Verify (ts.tv_sec * 10) + digit <= TIME_T_MAX. */
i = *str++ - '0';
/* Verify (ts.tv_sec * 10) + (digit * 60) <= TIME_T_MAX. */
i = (*str++ - '0') * 60L;
if (ts.tv_sec > (TIME_T_MAX - i) / 10)
debug_return_bool(false); /* overflow */
ts.tv_sec *= 10;
ts.tv_sec += i;
}
if (*str++ == '.') {
/* Convert optional fractional component to nanosecs. */
long long nsec = 0;
/* Convert optional fractional component to seconds and nanosecs. */
for (i = 100000000; i > 0; i /= 10) {
if (*str == '\0')
break;
if (!isdigit((unsigned char)*str))
debug_return_bool(false); /* invalid number */
ts.tv_nsec += i * (*str++ - '0');
nsec += i * (*str++ - '0') * 60LL;
}
}
/* Convert from minutes to seconds. */
if (ts.tv_sec > TIME_T_MAX / 60)
debug_return_bool(false); /* overflow */
ts.tv_sec *= 60;
ts.tv_nsec *= 60;
while (ts.tv_nsec >= 1000000000) {
ts.tv_sec++;
ts.tv_nsec -= 1000000000;
while (nsec >= 1000000000) {
if (ts.tv_sec == TIME_T_MAX)
debug_return_bool(false); /* overflow */
ts.tv_sec++;
nsec -= 1000000000;
}
ts.tv_nsec = nsec;
}
}
if (sign == '-') {