mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 04:40:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Fix overflow checks to use the correct "time_t" [PR 93456]

Browse Source 
I recently added overflow checks to src/c++11/futex.cc for PR 93456, but
then changed the type of the timespec for PR 93421. This meant the
overflow checks were no longer using the right range, because the
variable being written to might be smaller than time_t.

This introduces new typedef that corresponds to the tv_sec member of the
struct being passed to the syscall, and uses that typedef in the range
checks.

libstdc++-v3/ChangeLog:

	PR libstdc++/93421
	PR libstdc++/93456
	* src/c++11/futex.cc (syscall_time_t): New typedef for
	the type of the syscall_timespec::tv_sec member.
	(relative_timespec, _M_futex_wait_until)
	(_M_futex_wait_until_steady): Use syscall_time_t in overflow
	checks, not time_t.
This commit is contained in:
Jonathan Wakely 2020-11-19 13:33:11 +00:00
parent bf425849f1
commit b108faa940
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/src/c++11/futex.cc
View File

@ -64,8 +64,10 @@ namespace
// The SYS_futex syscall still uses the old definition of timespec
// where tv_sec is 32 bits, so define a type that matches that.
struct syscall_timespec { long tv_sec; long tv_nsec; };
using syscall_time_t = long;
#else
using syscall_timespec = ::timespec;
using syscall_time_t = time_t;
#endif
// Return the relative duration from (now_s + now_ns) to (abs_s + abs_ns)
@ -86,9 +88,9 @@ namespace
const auto rel_s = abs_s.count() - now_s;
// Convert the absolute timeout to a relative timeout, without overflow.
if (rel_s > __int_traits<time_t>::__max) [[unlikely]]
if (rel_s > __int_traits<syscall_time_t>::__max) [[unlikely]]
{
rt.tv_sec = __int_traits<time_t>::__max;
rt.tv_sec = __int_traits<syscall_time_t>::__max;
rt.tv_nsec = 999999999;
}
else
@ -130,8 +132,8 @@ namespace
return false;
syscall_timespec rt;
if (__s.count() > __int_traits<time_t>::__max) [[unlikely]]
rt.tv_sec = __int_traits<time_t>::__max;
if (__s.count() > __int_traits<syscall_time_t>::__max) [[unlikely]]
rt.tv_sec = __int_traits<syscall_time_t>::__max;
else
rt.tv_sec = __s.count();
rt.tv_nsec = __ns.count();
@ -206,8 +208,8 @@ namespace
return false;
syscall_timespec rt;
if (__s.count() > __int_traits<time_t>::__max) [[unlikely]]
rt.tv_sec = __int_traits<time_t>::__max;
if (__s.count() > __int_traits<syscall_time_t>::__max) [[unlikely]]
rt.tv_sec = __int_traits<syscall_time_t>::__max;
else
rt.tv_sec = __s.count();
rt.tv_nsec = __ns.count();