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

Fix clock_nanosleep when interrupted by a signal 

This patch fixes the time64 support (added by 2e44b10b42) where it
misses the remaining argument updated if __NR_clock_nanosleep
returns EINTR.

Checked on i686-linux-gnu on 4.15 kernel (no time64 support) and
on 5.3 kernel (with time64 support).

Reviewed-by: Alistair Francis <alistair23@gmail.com>
This commit is contained in:
Adhemerval Zanella 2019-11-11 13:28:37 -03:00
parent f0f0d79ac3
commit 42b926d303
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,13 +52,10 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec
r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, err, clock_id, r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, err, clock_id,
flags, req, rem); flags, req, rem);
if (r == 0 || errno != ENOSYS) if (r != -ENOSYS)
{
return (INTERNAL_SYSCALL_ERROR_P (r, err) return (INTERNAL_SYSCALL_ERROR_P (r, err)
? INTERNAL_SYSCALL_ERRNO (r, err) : 0); ? INTERNAL_SYSCALL_ERRNO (r, err) : 0);
}
# endif /* __NR_clock_nanosleep_time64 */ # endif /* __NR_clock_nanosleep_time64 */
struct timespec ts32, tr32;
if (! in_time_t_range (req->tv_sec)) if (! in_time_t_range (req->tv_sec))
{ {
@ -66,11 +63,12 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec
return -1; return -1;
} }
ts32 = valid_timespec64_to_timespec (*req); struct timespec tr32;
struct timespec ts32 = valid_timespec64_to_timespec (*req);
r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, err, clock_id, flags, r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep, err, clock_id, flags,
&ts32, &tr32); &ts32, &tr32);
if (r == 0 && rem != NULL) if (r == -EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
*rem = valid_timespec_to_timespec64 (tr32); *rem = valid_timespec_to_timespec64 (tr32);
#endif /* __ASSUME_TIME64_SYSCALLS */ #endif /* __ASSUME_TIME64_SYSCALLS */
@ -89,7 +87,7 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
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, &trem64);
if (r == 0 && rem != NULL) if (r == EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0)
*rem = valid_timespec64_to_timespec (trem64); *rem = valid_timespec64_to_timespec (trem64);
return r; return r;