drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: clock_nanosleep is not supposed to crash, return EFAULT instead 

...in case rqtp or rmtp specified invalid addresses.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2019-01-11 15:15:32 +01:00
parent 8d1d8fc914
commit 9ef0cd6a6c
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
winsup/cygwin/signal.cc
View File

@ -65,8 +65,16 @@ clock_nanosleep (clockid_t clk_id, int flags, const struct timespec *rqtp,
sig_dispatch_pending (); sig_dispatch_pending ();
pthread_testcancel (); pthread_testcancel ();
if (rqtp->tv_sec < 0 || rqtp->tv_nsec < 0 || rqtp->tv_nsec >= NSPERSEC) __try
return EINVAL; {
if (rqtp->tv_sec < 0 || rqtp->tv_nsec < 0 || rqtp->tv_nsec >= NSPERSEC)
return EINVAL;
}
__except (NO_ERROR)
{
return EFAULT;
}
__endtry
/* Explicitly disallowed by POSIX. Needs to be checked first to avoid /* Explicitly disallowed by POSIX. Needs to be checked first to avoid
being caught by the following test. */ being caught by the following test. */
@ -122,9 +130,17 @@ clock_nanosleep (clockid_t clk_id, int flags, const struct timespec *rqtp,
/* according to POSIX, rmtp is used only if !abstime */ /* according to POSIX, rmtp is used only if !abstime */
if (rmtp && !abstime) if (rmtp && !abstime)
{ {
rmtp->tv_sec = (time_t) (timeout.QuadPart / NS100PERSEC); __try
rmtp->tv_nsec = (long) ((timeout.QuadPart % NS100PERSEC) {
* (NSPERSEC/NS100PERSEC)); rmtp->tv_sec = (time_t) (timeout.QuadPart / NS100PERSEC);
rmtp->tv_nsec = (long) ((timeout.QuadPart % NS100PERSEC)
* (NSPERSEC/NS100PERSEC));
}
__except (NO_ERROR)
{
res = EFAULT;
}
__endtry
} }
syscall_printf ("%d = clock_nanosleep(%lu, %d, %ld.%09ld, %ld.%09.ld)", syscall_printf ("%d = clock_nanosleep(%lu, %d, %ld.%09ld, %ld.%09.ld)",