qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nanosleep: Pass NULL when rem == NULL on ports with __TIMESIZE != 64 

On ports with __TIMESIZE != 64 the remaining time argument always receives
pointer to struct __timespec64 instance. This is the different behavior
when compared to 64 bit versions of clock_nanosleep and nanosleep
functions, which receive NULL.

To avoid any potential issues, we also pass NULL when *rem pointer is
NULL.

Reported-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Lukasz Majewski 2020-11-12 12:24:04 +01:00
parent eb60eda2b9
commit 7ed2b6921f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysdeps/unix/sysv/linux/clock_nanosleep.c
View File

@ -78,7 +78,8 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
struct __timespec64 treq64, trem64; struct __timespec64 treq64, trem64;
treq64 = valid_timespec_to_timespec64 (*req); treq64 = valid_timespec_to_timespec64 (*req);
r = __clock_nanosleep_time64 (clock_id, flags, &treq64, &trem64); r = __clock_nanosleep_time64 (clock_id, flags, &treq64,
rem != NULL ? &trem64 : NULL);
if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0) if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
*rem = valid_timespec64_to_timespec (trem64); *rem = valid_timespec64_to_timespec (trem64);

2
sysdeps/unix/sysv/linux/nanosleep.c
View File

@ -39,7 +39,7 @@ __nanosleep (const struct timespec *req, struct timespec *rem)
struct __timespec64 treq64, trem64; struct __timespec64 treq64, trem64;
treq64 = valid_timespec_to_timespec64 (*req); treq64 = valid_timespec_to_timespec64 (*req);
int ret = __nanosleep64 (&treq64, &trem64); int ret = __nanosleep64 (&treq64, rem != NULL ? &trem64 : NULL);
if (ret != 0 && errno == EINTR && rem != NULL) if (ret != 0 && errno == EINTR && rem != NULL)
*rem = valid_timespec64_to_timespec (trem64); *rem = valid_timespec64_to_timespec (trem64);