espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-17 06:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[posix] fix potential timeout calculation overflows (#7045)

Browse Source
This commit is contained in:
Simon Lin
2021-09-29 23:43:13 -07:00
committed by GitHub
parent 0696ce45a8
commit 3e82174c53
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/posix/platform/alarm.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ uint64_t otPlatTimeGet(void)
VerifyOrDie(clock_gettime(OT_POSIX_CLOCK_ID, &now) == 0, OT_EXIT_FAILURE);
return (uint64_t)now.tv_sec * US_PER_S + (uint64_t)now.tv_nsec / NS_PER_US;
return static_cast<uint64_t>(now.tv_sec) * US_PER_S + static_cast<uint64_t>(now.tv_nsec) / NS_PER_US;
}
#endif // !OPENTHREAD_POSIX_VIRTUAL_TIME
@@ -246,7 +246,7 @@ exit:
remaining = 1;
}
if (remaining < aTimeout->tv_sec * US_PER_S + aTimeout->tv_usec)
if (remaining < static_cast<int64_t>(aTimeout->tv_sec) * US_PER_S + static_cast<int64_t>(aTimeout->tv_usec))
{
aTimeout->tv_sec = static_cast<time_t>(remaining / US_PER_S);
aTimeout->tv_usec = static_cast<suseconds_t>(remaining % US_PER_S);
src/posix/platform/radio.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ void platformRadioUpdateFdSet(fd_set *aReadFdSet, fd_set *aWriteFdSet, int *aMax
{
uint64_t remain = deadline - now;
if (remain < static_cast<uint64_t>(aTimeout->tv_sec * US_PER_S + aTimeout->tv_usec))
if (remain < (static_cast<uint64_t>(aTimeout->tv_sec) * US_PER_S + static_cast<uint64_t>(aTimeout->tv_usec)))
{
aTimeout->tv_sec = static_cast<time_t>(remain / US_PER_S);
aTimeout->tv_usec = static_cast<suseconds_t>(remain % US_PER_S);